diff options
Diffstat (limited to 'drivers/usb/gadget/pxa25x_udc.c')
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 907ad3ecb341..8efbf08c3561 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <linux/dma-mapping.h> | 33 | #include <linux/dma-mapping.h> |
34 | #include <linux/irq.h> | 34 | #include <linux/irq.h> |
35 | #include <linux/clk.h> | 35 | #include <linux/clk.h> |
36 | #include <linux/err.h> | ||
37 | #include <linux/seq_file.h> | 36 | #include <linux/seq_file.h> |
38 | #include <linux/debugfs.h> | 37 | #include <linux/debugfs.h> |
39 | #include <linux/io.h> | 38 | #include <linux/io.h> |
@@ -1000,7 +999,7 @@ static int pxa25x_udc_vbus_draw(struct usb_gadget *_gadget, unsigned mA) | |||
1000 | } | 999 | } |
1001 | 1000 | ||
1002 | static int pxa25x_start(struct usb_gadget_driver *driver, | 1001 | static int pxa25x_start(struct usb_gadget_driver *driver, |
1003 | int (*bind)(struct usb_gadget *)); | 1002 | int (*bind)(struct usb_gadget *, struct usb_gadget_driver *)); |
1004 | static int pxa25x_stop(struct usb_gadget_driver *driver); | 1003 | static int pxa25x_stop(struct usb_gadget_driver *driver); |
1005 | 1004 | ||
1006 | static const struct usb_gadget_ops pxa25x_udc_ops = { | 1005 | static const struct usb_gadget_ops pxa25x_udc_ops = { |
@@ -1258,7 +1257,7 @@ static void udc_enable (struct pxa25x_udc *dev) | |||
1258 | * the driver might get unbound. | 1257 | * the driver might get unbound. |
1259 | */ | 1258 | */ |
1260 | static int pxa25x_start(struct usb_gadget_driver *driver, | 1259 | static int pxa25x_start(struct usb_gadget_driver *driver, |
1261 | int (*bind)(struct usb_gadget *)) | 1260 | int (*bind)(struct usb_gadget *, struct usb_gadget_driver *)) |
1262 | { | 1261 | { |
1263 | struct pxa25x_udc *dev = the_controller; | 1262 | struct pxa25x_udc *dev = the_controller; |
1264 | int retval; | 1263 | int retval; |
@@ -1286,7 +1285,7 @@ fail: | |||
1286 | dev->gadget.dev.driver = NULL; | 1285 | dev->gadget.dev.driver = NULL; |
1287 | return retval; | 1286 | return retval; |
1288 | } | 1287 | } |
1289 | retval = bind(&dev->gadget); | 1288 | retval = bind(&dev->gadget, driver); |
1290 | if (retval) { | 1289 | if (retval) { |
1291 | DMSG("bind to driver %s --> error %d\n", | 1290 | DMSG("bind to driver %s --> error %d\n", |
1292 | driver->driver.name, retval); | 1291 | driver->driver.name, retval); |