Merge remote-tracking branch 'spi/fix/core' into spi-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / usb / gadget / imx_udc.c

diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
index 5bd930d779b9dd957b51d610469b4e6e4ead5663..9b2d24e4c95f0c27f3e98c0d2dbf3aa6bfad4b83 100644 (file)
--- a/drivers/usb/gadget/imx_udc.c
+++ b/drivers/usb/gadget/imx_udc.c
@@ -1338,7 +1338,6 @@ static int imx_udc_start(struct usb_gadget *gadget,
        imx_usb = container_of(gadget, struct imx_udc_struct, gadget);
        /* first hook up the driver ... */
        imx_usb->driver = driver;
-       imx_usb->gadget.dev.driver = &driver->driver;
 
        D_INI(imx_usb->dev, "<%s> registered gadget driver '%s'\n",
                __func__, driver->driver.name);
@@ -1358,7 +1357,6 @@ static int imx_udc_stop(struct usb_gadget *gadget,
        imx_udc_disable(imx_usb);
        del_timer(&imx_usb->timer);
 
-       imx_usb->gadget.dev.driver = NULL;
        imx_usb->driver = NULL;
 
        D_INI(imx_usb->dev, "<%s> unregistered gadget driver '%s'\n",
@@ -1461,15 +1459,6 @@ static int __init imx_udc_probe(struct platform_device *pdev)
        imx_usb->clk = clk;
        imx_usb->dev = &pdev->dev;
 
-       device_initialize(&imx_usb->gadget.dev);
-
-       imx_usb->gadget.dev.parent = &pdev->dev;
-       imx_usb->gadget.dev.dma_mask = pdev->dev.dma_mask;
-
-       ret = device_add(&imx_usb->gadget.dev);
-       if (retval)
-               goto fail4;
-
        platform_set_drvdata(pdev, imx_usb);
 
        usb_init_data(imx_usb);
@@ -1481,11 +1470,9 @@ static int __init imx_udc_probe(struct platform_device *pdev)
 
        ret = usb_add_gadget_udc(&pdev->dev, &imx_usb->gadget);
        if (ret)
-               goto fail5;
+               goto fail4;
 
        return 0;
-fail5:
-       device_unregister(&imx_usb->gadget.dev);
 fail4:
        for (i = 0; i < IMX_USB_NB_EP + 1; i++)
                free_irq(imx_usb->usbd_int[i], imx_usb);
@@ -1509,7 +1496,6 @@ static int __exit imx_udc_remove(struct platform_device *pdev)
        int i;
 
        usb_del_gadget_udc(&imx_usb->gadget);
-       device_unregister(&imx_usb->gadget.dev);
        imx_udc_disable(imx_usb);
        del_timer(&imx_usb->timer);
 
@@ -1525,8 +1511,6 @@ static int __exit imx_udc_remove(struct platform_device *pdev)
        if (pdata->exit)
                pdata->exit(&pdev->dev);
 
-       platform_set_drvdata(pdev, NULL);
-
        return 0;
 }