usb: musb: use platform_device_register_full() to avoid directly messing with dma masks

Use platform_device_register_full() for those drivers which can, to
avoid messing directly with DMA masks.  This can only be done when
the driver does not need to access the allocated musb platform device
from within its callbacks, which may be called during the musb
device probing.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 17 insertions, 31 deletions

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index ed0834e2b72e..45aae0bbb8df 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -505,7 +505,11 @@ static const struct musb_platform_ops davinci_ops = {
         .set_vbus       = davinci_musb_set_vbus,
 };
 
-static u64 davinci_dmamask = DMA_BIT_MASK(32);
+static const struct platform_device_info davinci_dev_info = {
+        .name           = "musb-hdrc",
+        .id             = PLATFORM_DEVID_AUTO,
+        .dma_mask       = DMA_BIT_MASK(32),
+};
 
 static int davinci_probe(struct platform_device *pdev)
 {
@@ -513,6 +517,7 @@ static int davinci_probe(struct platform_device *pdev)
         struct musb_hdrc_platform_data  *pdata = dev_get_platdata(&pdev->dev);
         struct platform_device          *musb;
         struct davinci_glue             *glue;
+        struct platform_device_info     pinfo;
         struct clk                      *clk;
 
         int                             ret = -ENOMEM;
@@ -523,12 +528,6 @@ static int davinci_probe(struct platform_device *pdev)
                 goto err0;
         }
 
-        musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO);
-        if (!musb) {
-                dev_err(&pdev->dev, "failed to allocate musb device\n");
-                goto err1;
-        }
-
         clk = clk_get(&pdev->dev, "usb");
         if (IS_ERR(clk)) {
                 dev_err(&pdev->dev, "failed to get clock\n");
@@ -542,12 +541,7 @@ static int davinci_probe(struct platform_device *pdev)
                 goto err4;
         }
 
-        musb->dev.parent                = &pdev->dev;
-        musb->dev.dma_mask              = &davinci_dmamask;
-        musb->dev.coherent_dma_mask     = davinci_dmamask;
-
         glue->dev                       = &pdev->dev;
-        glue->musb                      = musb;
         glue->clk                       = clk;
 
         pdata->platform_ops             = &davinci_ops;
@@ -567,22 +561,17 @@ static int davinci_probe(struct platform_device *pdev)
         musb_resources[1].end = pdev->resource[1].end;
         musb_resources[1].flags = pdev->resource[1].flags;
 
-        ret = platform_device_add_resources(musb, musb_resources,
-                        ARRAY_SIZE(musb_resources));
-        if (ret) {
-                dev_err(&pdev->dev, "failed to add resources\n");
-                goto err5;
-        }
-
-        ret = platform_device_add_data(musb, pdata, sizeof(*pdata));
-        if (ret) {
-                dev_err(&pdev->dev, "failed to add platform_data\n");
-                goto err5;
-        }
-
-        ret = platform_device_add(musb);
-        if (ret) {
-                dev_err(&pdev->dev, "failed to register musb device\n");
+        pinfo = davinci_dev_info;
+        pinfo.parent = &pdev->dev;
+        pinfo.res = musb_resources;
+        pinfo.num_res = ARRAY_SIZE(musb_resources);
+        pinfo.data = pdata;
+        pinfo.size_data = sizeof(*pdata);
+
+        glue->musb = musb = platform_device_register_full(&pinfo);
+        if (IS_ERR(musb)) {
+                ret = PTR_ERR(musb);
+                dev_err(&pdev->dev, "failed to register musb device: %d\n", ret);
                 goto err5;
         }
 
@@ -595,9 +584,6 @@ err4:
         clk_put(clk);
 
 err3:
-        platform_device_put(musb);
-
-err1:
         kfree(glue);
 
 err0: