Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77c4400f authored by Richard Zhao's avatar Richard Zhao Committed by Greg Kroah-Hartman
Browse files

USB: Chipidea: rename struct ci13xxx_udc_driver to struct ci13xxx_platform_data 



This patch rename struct ci13xxx_udc_driver and var with the type.

ci13xxx_platform_data reflect it's passed from platfrom driver.

Signed-off-by: default avatarRichard Zhao <richard.zhao@freescale.com>
Reviewed-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6bf83594

drivers/usb/chipidea/ci.h

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ struct hw_bank { 
 * @remote_wakeup: host-enabled remote wakeup

 * @suspended: suspended by host

 * @test_mode: the selected test mode

 * @udc_driver: platform specific information supplied by parent device

 * @platdata: platform specific information supplied by parent device

 * @vbus_active: is VBUS active

 * @transceiver: pointer to USB PHY, if any

 * @hcd: pointer to usb_hcd for ehci host driver
@@ -158,7 +158,7 @@ struct ci13xxx { 
	u8				suspended;

	u8				test_mode;



	struct ci13xxx_udc_driver	*udc_driver;

	struct ci13xxx_platform_data	*platdata;

	int				vbus_active;

	struct usb_phy			*transceiver;

	struct usb_hcd			*hcd;

drivers/usb/chipidea/ci13xxx_msm.c

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static void ci13xxx_msm_notify_event(struct ci13xxx *udc, unsigned event) 
	}

}



static struct ci13xxx_udc_driver ci13xxx_msm_udc_driver = {

static struct ci13xxx_platform_data ci13xxx_msm_platdata = {

	.name			= "ci13xxx_msm",

	.flags			= CI13XXX_REGS_SHARED |

				  CI13XXX_REQUIRE_TRANSCEIVER |
@@ -75,8 +75,8 @@ static int __devinit ci13xxx_msm_probe(struct platform_device *pdev) 
		goto put_platform;

	}



	ret = platform_device_add_data(plat_ci, &ci13xxx_msm_udc_driver,

				       sizeof(ci13xxx_msm_udc_driver));

	ret = platform_device_add_data(plat_ci, &ci13xxx_msm_platdata,

				       sizeof(ci13xxx_msm_platdata));

	if (ret)

		goto put_platform;

drivers/usb/chipidea/ci13xxx_pci.c

+10 −10
Original line number Diff line number Diff line
@@ -23,17 +23,17 @@ 
/******************************************************************************

 * PCI block

 *****************************************************************************/

struct ci13xxx_udc_driver pci_driver = {

struct ci13xxx_platform_data pci_platdata = {

	.name		= UDC_DRIVER_NAME,

	.capoffset	= DEF_CAPOFFSET,

};



struct ci13xxx_udc_driver langwell_pci_driver = {

struct ci13xxx_platform_data langwell_pci_platdata = {

	.name		= UDC_DRIVER_NAME,

	.capoffset	= 0,

};



struct ci13xxx_udc_driver penwell_pci_driver = {

struct ci13xxx_platform_data penwell_pci_platdata = {

	.name		= UDC_DRIVER_NAME,

	.capoffset	= 0,

	.power_budget	= 200,
@@ -51,12 +51,12 @@ struct ci13xxx_udc_driver penwell_pci_driver = { 
static int __devinit ci13xxx_pci_probe(struct pci_dev *pdev,

				       const struct pci_device_id *id)

{

	struct ci13xxx_udc_driver *driver = (void *)id->driver_data;

	struct ci13xxx_platform_data *platdata = (void *)id->driver_data;

	struct platform_device *plat_ci;

	struct resource res[3];

	int retval = 0, nres = 2;



	if (!driver) {

	if (!platdata) {

		dev_err(&pdev->dev, "device doesn't provide driver data\n");

		return -ENODEV;

	}
@@ -95,7 +95,7 @@ static int __devinit ci13xxx_pci_probe(struct pci_dev *pdev, 
		goto put_platform;

	}



	retval = platform_device_add_data(plat_ci, driver, sizeof(*driver));

	retval = platform_device_add_data(plat_ci, platdata, sizeof(*platdata));

	if (retval)

		goto put_platform;
@@ -147,19 +147,19 @@ static void __devexit ci13xxx_pci_remove(struct pci_dev *pdev) 
static DEFINE_PCI_DEVICE_TABLE(ci13xxx_pci_id_table) = {

	{

		PCI_DEVICE(0x153F, 0x1004),

		.driver_data = (kernel_ulong_t)&pci_driver,

		.driver_data = (kernel_ulong_t)&pci_platdata,

	},

	{

		PCI_DEVICE(0x153F, 0x1006),

		.driver_data = (kernel_ulong_t)&pci_driver,

		.driver_data = (kernel_ulong_t)&pci_platdata,

	},

	{

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0811),

		.driver_data = (kernel_ulong_t)&langwell_pci_driver,

		.driver_data = (kernel_ulong_t)&langwell_pci_platdata,

	},

	{

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0829),

		.driver_data = (kernel_ulong_t)&penwell_pci_driver,

		.driver_data = (kernel_ulong_t)&penwell_pci_platdata,

	},

	{ 0, 0, 0, 0, 0, 0, 0 /* end: all zeroes */ }

};

drivers/usb/chipidea/core.c

+6 −6
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int hw_device_init(struct ci13xxx *ci, void __iomem *base) 
	ci->hw_bank.abs = base;



	ci->hw_bank.cap = ci->hw_bank.abs;

	ci->hw_bank.cap += ci->udc_driver->capoffset;

	ci->hw_bank.cap += ci->platdata->capoffset;

	ci->hw_bank.op = ci->hw_bank.cap + ioread8(ci->hw_bank.cap);



	hw_alloc_regmap(ci, false);
@@ -227,11 +227,11 @@ int hw_device_reset(struct ci13xxx *ci, u32 mode) 
		udelay(10);		/* not RTOS friendly */





	if (ci->udc_driver->notify_event)

		ci->udc_driver->notify_event(ci,

	if (ci->platdata->notify_event)

		ci->platdata->notify_event(ci,

			CI13XXX_CONTROLLER_RESET_EVENT);



	if (ci->udc_driver->flags & CI13XXX_DISABLE_STREAMING)

	if (ci->platdata->flags & CI13XXX_DISABLE_STREAMING)

		hw_write(ci, OP_USBMODE, USBMODE_CI_SDIS, USBMODE_CI_SDIS);



	/* USBMODE should be configured step by step */
@@ -364,7 +364,7 @@ static int __devinit ci_hdrc_probe(struct platform_device *pdev) 
	}



	ci->dev = dev;

	ci->udc_driver = dev->platform_data;

	ci->platdata = dev->platform_data;



	ret = hw_device_init(ci, base);

	if (ret < 0) {
@@ -419,7 +419,7 @@ static int __devinit ci_hdrc_probe(struct platform_device *pdev) 
	}



	platform_set_drvdata(pdev, ci);

	ret = request_irq(ci->irq, ci_irq, IRQF_SHARED, ci->udc_driver->name,

	ret = request_irq(ci->irq, ci_irq, IRQF_SHARED, ci->platdata->name,

			  ci);

	if (ret)

		goto stop;

drivers/usb/chipidea/host.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int host_start(struct ci13xxx *ci) 
	hcd->regs = ci->hw_bank.abs;

	hcd->has_tt = 1;



	hcd->power_budget = ci->udc_driver->power_budget;

	hcd->power_budget = ci->platdata->power_budget;



	ehci = hcd_to_ehci(hcd);

	ehci->caps = ci->hw_bank.cap;