usb: gadget: use dev_get_platdata()

Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index d9a6add0c8526e06778addb733ce3e53da78a291..d237429dd93a46e8c78bfa34e7d82874789cc348 100644 (file)
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1697,7 +1697,7 @@ static int at91udc_probe(struct platform_device *pdev)
        int             retval;
        struct resource *res;
 
-       if (!dev->platform_data && !pdev->dev.of_node) {
+       if (!dev_get_platdata(dev) && !pdev->dev.of_node) {
                /* small (so we copy it) but critical! */
                DBG("missing platform_data\n");
                return -ENODEV;
@@ -1728,7 +1728,7 @@ static int at91udc_probe(struct platform_device *pdev)
        if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node)
                at91udc_of_init(udc, pdev->dev.of_node);
        else
-               memcpy(&udc->board, dev->platform_data,
+               memcpy(&udc->board, dev_get_platdata(dev),
                       sizeof(struct at91_udc_data));
        udc->pdev = pdev;
        udc->enabled = 0;

diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index f018017e3a77da728008b880946657f031c6f2ba..40d23384b716866b6b0b30923a1ffc3515ecc244 100644 (file)
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -1931,7 +1931,7 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev,
 static struct usba_ep * usba_udc_pdata(struct platform_device *pdev,
                                                 struct usba_udc *udc)
 {
-       struct usba_platform_data *pdata = pdev->dev.platform_data;
+       struct usba_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct usba_ep *eps;
        int i;
 

diff --git a/drivers/usb/gadget/bcm63xx_udc.c b/drivers/usb/gadget/bcm63xx_udc.c
index fd24cb4540a49d6b0382b932ff99eae2dc9c309f..c58fcf1ebe414784568a9afc6911ecb00e10a409 100644 (file)
--- a/drivers/usb/gadget/bcm63xx_udc.c
+++ b/drivers/usb/gadget/bcm63xx_udc.c
@@ -2313,7 +2313,7 @@ static void bcm63xx_udc_cleanup_debugfs(struct bcm63xx_udc *udc)
 static int bcm63xx_udc_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct bcm63xx_usbd_platform_data *pd = dev->platform_data;
+       struct bcm63xx_usbd_platform_data *pd = dev_get_platdata(dev);
        struct bcm63xx_udc *udc;
        struct resource *res;
        int rc = -ENOMEM, i, irq;

diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c
index d3bd7b095ba37713dfc3bdf1faaa39ddded393ac..9b140fc4d3bc5adcc4b815a885f7807fe6166b59 100644 (file)
--- a/drivers/usb/gadget/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/fsl_mxc_udc.c
@@ -33,7 +33,7 @@ int fsl_udc_clk_init(struct platform_device *pdev)
        unsigned long freq;
        int ret;
 
-       pdata = pdev->dev.platform_data;
+       pdata = dev_get_platdata(&pdev->dev);
 
        mxc_ipg_clk = devm_clk_get(&pdev->dev, "ipg");
        if (IS_ERR(mxc_ipg_clk)) {
@@ -80,7 +80,7 @@ eclkrate:
 
 int fsl_udc_clk_finalize(struct platform_device *pdev)
 {
-       struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
+       struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev);
        int ret = 0;
 
        /* workaround ENGcm09152 for i.MX35 */

diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index a766a4ca1cb78ff627b3de85b4a4aac01713cd38..36ac7cfba91df850224c96a397fe06838b071720 100644 (file)
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -2248,7 +2248,7 @@ static int __init struct_udc_setup(struct fsl_udc *udc,
        struct fsl_usb2_platform_data *pdata;
        size_t size;
 
-       pdata = pdev->dev.platform_data;
+       pdata = dev_get_platdata(&pdev->dev);
        udc->phy_mode = pdata->phy_mode;
 
        udc->eps = kzalloc(sizeof(struct fsl_ep) * udc->max_ep, GFP_KERNEL);
@@ -2343,7 +2343,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       pdata = pdev->dev.platform_data;
+       pdata = dev_get_platdata(&pdev->dev);
        udc_controller->pdata = pdata;
        spin_lock_init(&udc_controller->lock);
        udc_controller->stopped = 1;
@@ -2524,7 +2524,7 @@ err_kfree:
 static int __exit fsl_udc_remove(struct platform_device *pdev)
 {
        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
+       struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev);
 
        DECLARE_COMPLETION(done);
 

diff --git a/drivers/usb/gadget/hid.c b/drivers/usb/gadget/hid.c
index c36260ea8bf2ed0a5beea8aafb8377d235b7fa1d..778613eb37af8aaefd943c63c991462f722d435f 100644 (file)
--- a/drivers/usb/gadget/hid.c
+++ b/drivers/usb/gadget/hid.c
@@ -185,7 +185,7 @@ static int __exit hid_unbind(struct usb_composite_dev *cdev)
 
 static int __init hidg_plat_driver_probe(struct platform_device *pdev)
 {
-       struct hidg_func_descriptor *func = pdev->dev.platform_data;
+       struct hidg_func_descriptor *func = dev_get_platdata(&pdev->dev);
        struct hidg_func_node *entry;
 
        if (!func) {

diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 46ba9838c3a091d084af2472cd39ada76e42ac71..d5f050d30edfe7c917bbb6c09cfc3a4082404f7e 100644 (file)
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1584,7 +1584,7 @@ static int __init m66592_probe(struct platform_device *pdev)
                goto clean_up;
        }
 
-       if (pdev->dev.platform_data == NULL) {
+       if (dev_get_platdata(&pdev->dev) == NULL) {
                dev_err(&pdev->dev, "no platform data\n");
                ret = -ENODEV;
                goto clean_up;
@@ -1598,7 +1598,7 @@ static int __init m66592_probe(struct platform_device *pdev)
                goto clean_up;
        }
 
-       m66592->pdata = pdev->dev.platform_data;
+       m66592->pdata = dev_get_platdata(&pdev->dev);
        m66592->irq_trigger = ires->flags & IRQF_TRIGGER_MASK;
 
        spin_lock_init(&m66592->lock);

diff --git a/drivers/usb/gadget/mv_u3d_core.c b/drivers/usb/gadget/mv_u3d_core.c
index ec6a2d2903988ffb7a23aa12b63b0f95fd4f601a..bbb6e98c4384292d3446b62f8671decaf0a51c55 100644 (file)
--- a/drivers/usb/gadget/mv_u3d_core.c
+++ b/drivers/usb/gadget/mv_u3d_core.c
@@ -1109,7 +1109,7 @@ static int mv_u3d_controller_reset(struct mv_u3d *u3d)
 
 static int mv_u3d_enable(struct mv_u3d *u3d)
 {
-       struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
        int retval;
 
        if (u3d->active)
@@ -1138,7 +1138,7 @@ static int mv_u3d_enable(struct mv_u3d *u3d)
 
 static void mv_u3d_disable(struct mv_u3d *u3d)
 {
-       struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
        if (u3d->clock_gating && u3d->active) {
                dev_dbg(u3d->dev, "disable u3d\n");
                if (pdata->phy_deinit)
@@ -1246,7 +1246,7 @@ static int mv_u3d_start(struct usb_gadget *g,
                struct usb_gadget_driver *driver)
 {
        struct mv_u3d *u3d = container_of(g, struct mv_u3d, gadget);
-       struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
        unsigned long flags;
 
        if (u3d->driver)
@@ -1277,7 +1277,7 @@ static int mv_u3d_stop(struct usb_gadget *g,
                struct usb_gadget_driver *driver)
 {
        struct mv_u3d *u3d = container_of(g, struct mv_u3d, gadget);
-       struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
        unsigned long flags;
 
        u3d->vbus_valid_detect = 0;
@@ -1794,12 +1794,12 @@ static int mv_u3d_remove(struct platform_device *dev)
 static int mv_u3d_probe(struct platform_device *dev)
 {
        struct mv_u3d *u3d = NULL;
-       struct mv_usb_platform_data *pdata = dev->dev.platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(&dev->dev);
        int retval = 0;
        struct resource *r;
        size_t size;
 
-       if (!dev->dev.platform_data) {
+       if (!dev_get_platdata(&dev->dev)) {
                dev_err(&dev->dev, "missing platform_data\n");
                retval = -ENODEV;
                goto err_pdata;

diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index c2a57023e4671ccbb5a9e7f8930fecb67226901a..104cdbea635a6aee2ad169981382e37074ff141d 100644 (file)
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -2100,7 +2100,7 @@ static int mv_udc_remove(struct platform_device *pdev)
 
 static int mv_udc_probe(struct platform_device *pdev)
 {
-       struct mv_usb_platform_data *pdata = pdev->dev.platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct mv_udc *udc;
        int retval = 0;
        struct resource *r;
@@ -2118,7 +2118,7 @@ static int mv_udc_probe(struct platform_device *pdev)
        }
 
        udc->done = &release_done;
-       udc->pdata = pdev->dev.platform_data;
+       udc->pdata = dev_get_platdata(&pdev->dev);
        spin_lock_init(&udc->lock);
 
        udc->dev = pdev;

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index b8ed74a823cbb41c6f585fe422483905fc2567ea..83957cc225d982e9aba26ab717820c34b82a1308 100644 (file)
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2734,7 +2734,7 @@ static int omap_udc_probe(struct platform_device *pdev)
        int                     hmc;
        struct usb_phy          *xceiv = NULL;
        const char              *type = NULL;
-       struct omap_usb_config  *config = pdev->dev.platform_data;
+       struct omap_usb_config  *config = dev_get_platdata(&pdev->dev);
        struct clk              *dc_clk = NULL;
        struct clk              *hhc_clk = NULL;
 

diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 95c531d5aa4fa2dd9fcf4d038c5426254cb16629..cc9207473dbc33f204bbd4009eb9e2138f966da6 100644 (file)
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -2117,7 +2117,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
 
        /* other non-static parts of init */
        dev->dev = &pdev->dev;
-       dev->mach = pdev->dev.platform_data;
+       dev->mach = dev_get_platdata(&pdev->dev);
 
        dev->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
 

diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 41cea9566ac8bba0e194dc8b2f55668fa1d1707e..3c97da7760dac4d75797954398082866ebb56ff9 100644 (file)
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -2422,7 +2422,7 @@ static int pxa_udc_probe(struct platform_device *pdev)
                return udc->irq;
 
        udc->dev = &pdev->dev;
-       udc->mach = pdev->dev.platform_data;
+       udc->mach = dev_get_platdata(&pdev->dev);
        udc->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
 
        gpio = udc->mach->gpio_pullup;

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index c6af649f324008bb31706baecac5d91497a27cd7..68be48d3340411c9e91632e19dd15ec4fd3cbfe1 100644 (file)
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1910,7 +1910,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
 
        spin_lock_init(&r8a66597->lock);
        platform_set_drvdata(pdev, r8a66597);
-       r8a66597->pdata = pdev->dev.platform_data;
+       r8a66597->pdata = dev_get_platdata(&pdev->dev);
        r8a66597->irq_sense_low = irq_trigger == IRQF_TRIGGER_LOW;
 
        r8a66597->gadget.ops = &r8a66597_gadget_ops;

diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 616ed51f85858381ca39ba7cacaa8dc48282cdb0..d69b36a99dbcd8ae5a1bc57275398be86a2562ca 100644 (file)
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -3451,7 +3451,7 @@ static void s3c_hsotg_delete_debug(struct s3c_hsotg *hsotg)
 
 static int s3c_hsotg_probe(struct platform_device *pdev)
 {
-       struct s3c_hsotg_plat *plat = pdev->dev.platform_data;
+       struct s3c_hsotg_plat *plat = dev_get_platdata(&pdev->dev);
        struct usb_phy *phy;
        struct device *dev = &pdev->dev;
        struct s3c_hsotg_ep *eps;
@@ -3470,7 +3470,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
        phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
        if (IS_ERR(phy)) {
                /* Fallback for pdata */
-               plat = pdev->dev.platform_data;
+               plat = dev_get_platdata(&pdev->dev);
                if (!plat) {
                        dev_err(&pdev->dev, "no platform data or transceiver defined\n");
                        return -EPROBE_DEFER;

diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index b1f0771fbd3def2b35714515c40f0c5b14fadc21..1a1a41498db20545264dbfbf46f930e5cd735b8d 100644 (file)
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -1262,7 +1262,7 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct resource *res;
        struct s3c_hsudc *hsudc;
-       struct s3c24xx_hsudc_platdata *pd = pdev->dev.platform_data;
+       struct s3c24xx_hsudc_platdata *pd = dev_get_platdata(&pdev->dev);
        int ret, i;
 
        hsudc = devm_kzalloc(&pdev->dev, sizeof(struct s3c_hsudc) +
@@ -1275,7 +1275,7 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, dev);
        hsudc->dev = dev;
-       hsudc->pd = pdev->dev.platform_data;
+       hsudc->pd = dev_get_platdata(&pdev->dev);
 
        hsudc->transceiver = usb_get_phy(USB_PHY_TYPE_USB2);
 

diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index 09c4f70c93c4cb13639cf89ed7d423c2231df621..c72d810e6b36d7420ed6c28d774e79ebf30ab0d7 100644 (file)
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1809,7 +1809,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev)
        }
 
        spin_lock_init(&udc->lock);
-       udc_info = pdev->dev.platform_data;
+       udc_info = dev_get_platdata(&pdev->dev);
 
        rsrc_start = S3C2410_PA_USBDEV;
        rsrc_len   = S3C24XX_SZ_USBDEV;