usb: musb: davinci: give it a context structure

that structure currently only holds a device
pointer to our own platform_device and musb's
platform_device, but soon it will hold pointers
to our clock structures and glue-specific bits
and pieces.

Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index bdf1940..661870a 100644 (file)
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -53,6 +53,11 @@
 #define USB_PHY_CTRL   IO_ADDRESS(USBPHY_CTL_PADDR)
 #define DM355_DEEPSLEEP        IO_ADDRESS(DM355_DEEPSLEEP_PADDR)
 
+struct davinci_glue {
+       struct device           *dev;
+       struct platform_device  *musb;
+};
+
 /* REVISIT (PM) we should be able to keep the PHY in low power mode most
  * of the time (24 MHZ oscillator and PLL off, etc) by setting POWER.D0
  * and, when in host mode, autosuspending idle root ports... PHYPLLON
@@ -523,55 +528,69 @@ static int __init davinci_probe(struct platform_device *pdev)
 {
        struct musb_hdrc_platform_data  *pdata = pdev->dev.platform_data;
        struct platform_device          *musb;
+       struct davinci_glue             *glue;
 
        int                             ret = -ENOMEM;
 
+       glue = kzalloc(sizeof(*glue), GFP_KERNEL);
+       if (!glue) {
+               dev_err(&pdev->dev, "failed to allocate glue context\n");
+               goto err0;
+       }
+
        musb = platform_device_alloc("musb-hdrc", -1);
        if (!musb) {
                dev_err(&pdev->dev, "failed to allocate musb device\n");
-               goto err0;
+               goto err1;
        }
 
        musb->dev.parent                = &pdev->dev;
        musb->dev.dma_mask              = &davinci_dmamask;
        musb->dev.coherent_dma_mask     = davinci_dmamask;
 
-       platform_set_drvdata(pdev, musb);
+       glue->dev                       = &pdev->dev;
+       glue->musb                      = musb;
+
+       platform_set_drvdata(pdev, glue);
 
        ret = platform_device_add_resources(musb, pdev->resource,
                        pdev->num_resources);
        if (ret) {
                dev_err(&pdev->dev, "failed to add resources\n");
-               goto err1;
+               goto err2;
        }
 
        ret = platform_device_add_data(musb, pdata, sizeof(*pdata));
        if (ret) {
                dev_err(&pdev->dev, "failed to add platform_data\n");
-               goto err1;
+               goto err2;
        }
 
        ret = platform_device_add(musb);
        if (ret) {
                dev_err(&pdev->dev, "failed to register musb device\n");
-               goto err1;
+               goto err2;
        }
 
        return 0;
 
-err1:
+err2:
        platform_device_put(musb);
 
+err1:
+       kfree(glue);
+
 err0:
        return ret;
 }
 
 static int __exit davinci_remove(struct platform_device *pdev)
 {
-       struct platform_device          *musb = platform_get_drvdata(pdev);
+       struct davinci_glue             *glue = platform_get_drvdata(pdev);
 
-       platform_device_del(musb);
-       platform_device_put(musb);
+       platform_device_del(glue->musb);
+       platform_device_put(glue->musb);
+       kfree(glue);
 
        return 0;
 }