usb: gadget: use dev_get_platdata()

[karo-tx-linux.git] / drivers / usb / gadget / mv_u3d_core.c

diff --git a/drivers/usb/gadget/mv_u3d_core.c b/drivers/usb/gadget/mv_u3d_core.c
index 07fdb3eaf48a4fd1be386e346e6e9fccc53e78ce..bbb6e98c4384292d3446b62f8671decaf0a51c55 100644 (file)
--- a/drivers/usb/gadget/mv_u3d_core.c
+++ b/drivers/usb/gadget/mv_u3d_core.c
@@ -1109,7 +1109,7 @@ static int mv_u3d_controller_reset(struct mv_u3d *u3d)
 
 static int mv_u3d_enable(struct mv_u3d *u3d)
 {
-       struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
        int retval;
 
        if (u3d->active)
@@ -1138,7 +1138,7 @@ static int mv_u3d_enable(struct mv_u3d *u3d)
 
 static void mv_u3d_disable(struct mv_u3d *u3d)
 {
-       struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
        if (u3d->clock_gating && u3d->active) {
                dev_dbg(u3d->dev, "disable u3d\n");
                if (pdata->phy_deinit)
@@ -1246,7 +1246,7 @@ static int mv_u3d_start(struct usb_gadget *g,
                struct usb_gadget_driver *driver)
 {
        struct mv_u3d *u3d = container_of(g, struct mv_u3d, gadget);
-       struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
        unsigned long flags;
 
        if (u3d->driver)
@@ -1277,7 +1277,7 @@ static int mv_u3d_stop(struct usb_gadget *g,
                struct usb_gadget_driver *driver)
 {
        struct mv_u3d *u3d = container_of(g, struct mv_u3d, gadget);
-       struct mv_usb_platform_data *pdata = u3d->dev->platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
        unsigned long flags;
 
        u3d->vbus_valid_detect = 0;
@@ -1776,7 +1776,7 @@ static int mv_u3d_remove(struct platform_device *dev)
        kfree(u3d->eps);
 
        if (u3d->irq)
-               free_irq(u3d->irq, &dev->dev);
+               free_irq(u3d->irq, u3d);
 
        if (u3d->cap_regs)
                iounmap(u3d->cap_regs);
@@ -1794,12 +1794,12 @@ static int mv_u3d_remove(struct platform_device *dev)
 static int mv_u3d_probe(struct platform_device *dev)
 {
        struct mv_u3d *u3d = NULL;
-       struct mv_usb_platform_data *pdata = dev->dev.platform_data;
+       struct mv_usb_platform_data *pdata = dev_get_platdata(&dev->dev);
        int retval = 0;
        struct resource *r;
        size_t size;
 
-       if (!dev->dev.platform_data) {
+       if (!dev_get_platdata(&dev->dev)) {
                dev_err(&dev->dev, "missing platform_data\n");
                retval = -ENODEV;
                goto err_pdata;
@@ -1974,7 +1974,7 @@ static int mv_u3d_probe(struct platform_device *dev)
        return 0;
 
 err_unregister:
-       free_irq(u3d->irq, &dev->dev);
+       free_irq(u3d->irq, u3d);
 err_request_irq:
 err_get_irq:
        kfree(u3d->status_req);