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@xxxxxx>
---
drivers/usb/musb/am35x.c | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index 98804c3..54be6b6 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -82,6 +82,11 @@
#define USB_MENTOR_CORE_OFFSET 0x400
+struct am35x_glue {
+ struct device *dev;
+ struct platform_device *musb;
+};
+
static inline void phy_on(void)
{
unsigned long timeout = jiffies + msecs_to_jiffies(100);
@@ -544,58 +549,72 @@ static int __init am35x_probe(struct platform_device *pdev)
{
struct musb_hdrc_platform_data *pdata = pdev->dev.platform_data;
struct platform_device *musb;
+ struct am35x_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 = &am35x_dmamask;
musb->dev.coherent_dma_mask = am35x_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 err2;
+ goto err3;
}
return 0;
-err2:
+err3:
platform_device_put(musb);
-err1:
+err2:
platform_device_del(musb);
+err1:
+ kfree(glue);
+
err0:
return ret;
}
static int __exit am35x_remove(struct platform_device *pdev)
{
- struct platform_device *musb = platform_get_drvdata(pdev);
+ struct am35x_glue *glue = platform_get_drvdata(pdev);
- platform_device_put(musb);
- platform_device_del(musb);
+ platform_device_put(glue->musb);
+ platform_device_del(glue->musb);
+ kfree(glue);
return 0;
}
--
1.7.3.2.343.g7d43d
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
