usb: musb: blackfin: give it a context structure

[pandora-kernel.git] / drivers / usb / musb / blackfin.c

diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index b096820..02eded2 100644 (file)
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -23,6 +23,11 @@
 #include "musb_core.h"
 #include "blackfin.h"
 
+struct bfin_glue {
+       struct device           *dev;
+       struct platform_device  *musb;
+};
+
 /*
  * Load an endpoint's FIFO
  */
@@ -451,55 +456,69 @@ static int __init bfin_probe(struct platform_device *pdev)
 {
        struct musb_hdrc_platform_data  *pdata = pdev->dev.platform_data;
        struct platform_device          *musb;
+       struct bfin_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              = &bfin_dmamask;
        musb->dev.coherent_dma_mask     = bfin_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 bfin_remove(struct platform_device *pdev)
 {
-       struct platform_device          *musb = platform_get_drvdata(pdev);
+       struct bfin_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;
 }