Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / udc / m66592-udc.c

diff --git a/drivers/usb/gadget/udc/m66592-udc.c b/drivers/usb/gadget/udc/m66592-udc.c
index 898565687a8cb6af2806f8772cd78eada513bc41..8c7c83c937139b084b48dba9a548683c865481d2 100644 (file)
--- a/drivers/usb/gadget/udc/m66592-udc.c
+++ b/drivers/usb/gadget/udc/m66592-udc.c
@@ -1142,7 +1142,7 @@ static void irq_device_state(struct m66592 *m66592)
        m66592_write(m66592, ~M66592_DVST, M66592_INTSTS0);
 
        if (dvsq == M66592_DS_DFLT) {   /* bus reset */
-               m66592->driver->disconnect(&m66592->gadget);
+               usb_gadget_udc_reset(&m66592->gadget, m66592->driver);
                m66592_update_usb_speed(m66592);
        }
        if (m66592->old_dvsq == M66592_DS_CNFG && dvsq != M66592_DS_CNFG)
@@ -1485,8 +1485,7 @@ static int m66592_udc_start(struct usb_gadget *g,
        return 0;
 }
 
-static int m66592_udc_stop(struct usb_gadget *g,
-               struct usb_gadget_driver *driver)
+static int m66592_udc_stop(struct usb_gadget *g)
 {
        struct m66592 *m66592 = to_m66592(g);
 
@@ -1699,7 +1698,6 @@ static struct platform_driver m66592_driver = {
        .remove =       __exit_p(m66592_remove),
        .driver         = {
                .name = (char *) udc_name,
-               .owner  = THIS_MODULE,
        },
 };