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 / mv_u3d_core.c

diff --git a/drivers/usb/gadget/udc/mv_u3d_core.c b/drivers/usb/gadget/udc/mv_u3d_core.c
index 046a1f808b0d34d3726ac1dcde63683e7c30745d..ea35a248c8985fbc8ecc8b65fb4a02c1ab070738 100644 (file)
--- a/drivers/usb/gadget/udc/mv_u3d_core.c
+++ b/drivers/usb/gadget/udc/mv_u3d_core.c
@@ -1266,8 +1266,7 @@ static int mv_u3d_start(struct usb_gadget *g,
        return 0;
 }
 
-static int mv_u3d_stop(struct usb_gadget *g,
-               struct usb_gadget_driver *driver)
+static int mv_u3d_stop(struct usb_gadget *g)
 {
        struct mv_u3d *u3d = container_of(g, struct mv_u3d, gadget);
        struct mv_usb_platform_data *pdata = dev_get_platdata(u3d->dev);
@@ -1284,7 +1283,7 @@ static int mv_u3d_stop(struct usb_gadget *g,
        mv_u3d_controller_stop(u3d);
        /* stop all usb activities */
        u3d->gadget.speed = USB_SPEED_UNKNOWN;
-       mv_u3d_stop_activity(u3d, driver);
+       mv_u3d_stop_activity(u3d, NULL);
        mv_u3d_disable(u3d);
 
        if (pdata->phy_deinit)
@@ -2053,7 +2052,6 @@ static struct platform_driver mv_u3d_driver = {
        .remove         = mv_u3d_remove,
        .shutdown       = mv_u3d_shutdown,
        .driver         = {
-               .owner  = THIS_MODULE,
                .name   = "mv-u3d",
                .pm     = &mv_u3d_pm_ops,
        },