usb: chipidea: ci13xxx-imx: move static pdata into probe function
authorMichael Grzeschik <m.grzeschik@pengutronix.de>
Thu, 13 Jun 2013 14:59:58 +0000 (17:59 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2013 20:47:24 +0000 (13:47 -0700)
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>
drivers/usb/chipidea/ci13xxx_imx.c

index 9cecfd5..18d83ab 100644 (file)
@@ -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,