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

[linux-2.6-block.git] / drivers / usb / gadget / udc / lpc32xx_udc.c

diff --git a/drivers/usb/gadget/udc/lpc32xx_udc.c b/drivers/usb/gadget/udc/lpc32xx_udc.c
index feab0bac8fdc34b409f395339337f7a93f90c30e..34d9b7b831b34c86d22c58ba478fbb6a407da3ed 100644 (file)
--- a/drivers/usb/gadget/udc/lpc32xx_udc.c
+++ b/drivers/usb/gadget/udc/lpc32xx_udc.c
@@ -582,8 +582,7 @@ static void create_debug_file(struct lpc32xx_udc *udc)
 
 static void remove_debug_file(struct lpc32xx_udc *udc)
 {
-       if (udc->pde)
-               debugfs_remove(udc->pde);
+       debugfs_remove(udc->pde);
 }
 
 #else
@@ -2559,7 +2558,7 @@ static int lpc32xx_pullup(struct usb_gadget *gadget, int is_on)
 }
 
 static int lpc32xx_start(struct usb_gadget *, struct usb_gadget_driver *);
-static int lpc32xx_stop(struct usb_gadget *, struct usb_gadget_driver *);
+static int lpc32xx_stop(struct usb_gadget *);
 
 static const struct usb_gadget_ops lpc32xx_udc_ops = {
        .get_frame              = lpc32xx_get_frame,
@@ -2961,15 +2960,11 @@ static int lpc32xx_start(struct usb_gadget *gadget,
        return 0;
 }
 
-static int lpc32xx_stop(struct usb_gadget *gadget,
-                       struct usb_gadget_driver *driver)
+static int lpc32xx_stop(struct usb_gadget *gadget)
 {
        int i;
        struct lpc32xx_udc *udc = to_udc(gadget);
 
-       if (!driver || driver != udc->driver)
-               return -EINVAL;
-
        for (i = IRQ_USB_LP; i <= IRQ_USB_ATX; i++)
                disable_irq(udc->udp_irq[i]);
 
@@ -3410,7 +3405,6 @@ static struct platform_driver lpc32xx_udc_driver = {
        .resume         = lpc32xx_udc_resume,
        .driver         = {
                .name   = (char *) driver_name,
-               .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(lpc32xx_udc_of_match),
        },
 };