diff options
| author | Michael Grzeschik | 2013-06-13 16:59:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-06-17 22:47:24 +0200 |
| commit | f6a3b3a37c4772b6f0aef8e27c82e7f4287f05e3 (patch) | |
| tree | db131fa5a4db77b69737a48a86aa556061b484b2 /drivers/usb/chipidea/ci13xxx_imx.c | |
| parent | usb: chipidea: introduce dual role mode pdata flags (diff) | |
| download | kernel-qcow2-linux-f6a3b3a37c4772b6f0aef8e27c82e7f4287f05e3.tar.gz kernel-qcow2-linux-f6a3b3a37c4772b6f0aef8e27c82e7f4287f05e3.tar.xz kernel-qcow2-linux-f6a3b3a37c4772b6f0aef8e27c82e7f4287f05e3.zip | |
usb: chipidea: ci13xxx-imx: move static pdata into probe function
The pdata structure gets copied anyway inside ci13xxx_add_device
by platform_device_add. We don't need to have it static.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/chipidea/ci13xxx_imx.c')
| -rw-r--r-- | drivers/usb/chipidea/ci13xxx_imx.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/usb/chipidea/ci13xxx_imx.c b/drivers/usb/chipidea/ci13xxx_imx.c index 9cecfd517b78..18d83abac7cd 100644 --- a/drivers/usb/chipidea/ci13xxx_imx.c +++ b/drivers/usb/chipidea/ci13xxx_imx.c @@ -87,17 +87,16 @@ EXPORT_SYMBOL_GPL(usbmisc_get_init_data); /* End of common functions shared by usbmisc drivers*/ -static struct ci13xxx_platform_data ci13xxx_imx_platdata = { - .name = "ci13xxx_imx", - .flags = CI13XXX_REQUIRE_TRANSCEIVER | - CI13XXX_PULLUP_ON_VBUS | - CI13XXX_DISABLE_STREAMING, - .capoffset = DEF_CAPOFFSET, -}; - static int ci13xxx_imx_probe(struct platform_device *pdev) { struct ci13xxx_imx_data *data; + struct ci13xxx_platform_data pdata = { + .name = "ci13xxx_imx", + .capoffset = DEF_CAPOFFSET, + .flags = CI13XXX_REQUIRE_TRANSCEIVER | + CI13XXX_PULLUP_ON_VBUS | + CI13XXX_DISABLE_STREAMING, + }; struct platform_device *phy_pdev; struct resource *res; int ret; @@ -160,7 +159,7 @@ static int ci13xxx_imx_probe(struct platform_device *pdev) data->reg_vbus = NULL; } - ci13xxx_imx_platdata.phy = data->phy; + pdata.phy = data->phy; if (!pdev->dev.dma_mask) pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; @@ -178,7 +177,7 @@ static int ci13xxx_imx_probe(struct platform_device *pdev) data->ci_pdev = ci13xxx_add_device(&pdev->dev, pdev->resource, pdev->num_resources, - &ci13xxx_imx_platdata); + &pdata); if (IS_ERR(data->ci_pdev)) { ret = PTR_ERR(data->ci_pdev); dev_err(&pdev->dev, |