usb: musb: remove hand-crafted id handling

This replaced the handcrafted id handling by the PLATFORM_DEVID_AUTO
value which should do the same thing.

This patch probably also fixes ux500 because I did not find the "musbid"
variable to remove. And we close a tiny-unlikely race window becuase the
old code gave the id back before device was destroyed in the remove
case.

[ balbi@ti.com : fixed up two failed hunks when applying patch ]

Cc: B, Ravi <ravibabu@ti.com>
Cc: Santhapuri, Damodar <damodar.santhapuri@ti.com>
Cc: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Cc: Bob Liu <lliubbo@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 5 insertions, 19 deletions

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index a538fe17a966..dddd8f71a176 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -478,7 +478,6 @@ static int __devinit omap2430_probe(struct platform_device *pdev)
         struct musb_hdrc_config         *config;
         struct resource                 *res;
         int                             ret = -ENOMEM;
-        int                             musbid;
 
         glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
         if (!glue) {
@@ -486,21 +485,12 @@ static int __devinit omap2430_probe(struct platform_device *pdev)
                 goto err0;
         }
 
-        /* get the musb id */
-        musbid = musb_get_id(&pdev->dev, GFP_KERNEL);
-        if (musbid < 0) {
-                dev_err(&pdev->dev, "failed to allocate musb id\n");
-                ret = -ENOMEM;
-                goto err0;
-        }
-
-        musb = platform_device_alloc("musb-hdrc", musbid);
+        musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO);
         if (!musb) {
                 dev_err(&pdev->dev, "failed to allocate musb device\n");
-                goto err1;
+                goto err0;
         }
 
-        musb->id                        = musbid;
         musb->dev.parent                = &pdev->dev;
         musb->dev.dma_mask              = &omap2430_dmamask;
         musb->dev.coherent_dma_mask     = omap2430_dmamask;
@@ -521,7 +511,7 @@ static int __devinit omap2430_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev,
                                 "failed to allocate musb platfrom data\n");
                         ret = -ENOMEM;
-                        goto err1;
+                        goto err2;
                 }
 
                 data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
@@ -529,14 +519,14 @@ static int __devinit omap2430_probe(struct platform_device *pdev)
                         dev_err(&pdev->dev,
                                         "failed to allocate musb board data\n");
                         ret = -ENOMEM;
-                        goto err1;
+                        goto err2;
                 }
 
                 config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL);
                 if (!data) {
                         dev_err(&pdev->dev,
                                 "failed to allocate musb hdrc config\n");
-                        goto err1;
+                        goto err2;
                 }
 
                 of_property_read_u32(np, "mode", (u32 *)&pdata->mode);
@@ -589,9 +579,6 @@ static int __devinit omap2430_probe(struct platform_device *pdev)
 err2:
         platform_device_put(musb);
 
-err1:
-        musb_put_id(&pdev->dev, musbid);
-
 err0:
         return ret;
 }
@@ -601,7 +588,6 @@ static int __devexit omap2430_remove(struct platform_device *pdev)
         struct omap2430_glue            *glue = platform_get_drvdata(pdev);
 
         cancel_work_sync(&glue->omap_musb_mailbox_work);
-        musb_put_id(&pdev->dev, glue->musb->id);
         platform_device_unregister(glue->musb);
 
         return 0;