diff options
Diffstat (limited to 'drivers/usb/gadget/net2272.c')
| -rw-r--r-- | drivers/usb/gadget/net2272.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/net2272.c index 29151c44f476..7f1219e239a3 100644 --- a/drivers/usb/gadget/net2272.c +++ b/drivers/usb/gadget/net2272.c @@ -1172,11 +1172,17 @@ net2272_pullup(struct usb_gadget *_gadget, int is_on) return 0; } +static int net2272_start(struct usb_gadget_driver *driver, + int (*bind)(struct usb_gadget *)); +static int net2272_stop(struct usb_gadget_driver *driver); + static const struct usb_gadget_ops net2272_ops = { .get_frame = net2272_get_frame, .wakeup = net2272_wakeup, .set_selfpowered = net2272_set_selfpowered, - .pullup = net2272_pullup + .pullup = net2272_pullup, + .start = net2272_start, + .stop = net2272_stop, }; /*---------------------------------------------------------------------------*/ @@ -1447,7 +1453,7 @@ net2272_ep0_start(struct net2272 *dev) * disconnect is reported. then a host may connect again, or * the driver might get unbound. */ -int usb_gadget_probe_driver(struct usb_gadget_driver *driver, +static int net2272_start(struct usb_gadget_driver *driver, int (*bind)(struct usb_gadget *)) { struct net2272 *dev = the_controller; @@ -1487,7 +1493,6 @@ int usb_gadget_probe_driver(struct usb_gadget_driver *driver, return 0; } -EXPORT_SYMBOL(usb_gadget_probe_driver); static void stop_activity(struct net2272 *dev, struct usb_gadget_driver *driver) @@ -1515,7 +1520,7 @@ stop_activity(struct net2272 *dev, struct usb_gadget_driver *driver) net2272_usb_reinit(dev); } -int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) +static int net2272_stop(struct usb_gadget_driver *driver) { struct net2272 *dev = the_controller; unsigned long flags; @@ -1538,7 +1543,6 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver) dev_dbg(dev->dev, "unregistered driver '%s'\n", driver->driver.name); return 0; } -EXPORT_SYMBOL(usb_gadget_unregister_driver); /*---------------------------------------------------------------------------*/ /* handle ep-a/ep-b dma completions */ @@ -2217,6 +2221,8 @@ net2272_gadget_release(struct device *_dev) static void __devexit net2272_remove(struct net2272 *dev) { + usb_del_gadget_udc(&dev->gadget); + /* start with the driver above us */ if (dev->driver) { /* should have been done already by driver model core */ @@ -2310,8 +2316,14 @@ net2272_probe_fin(struct net2272 *dev, unsigned int irqflags) if (ret) goto err_dev_reg; + ret = usb_add_gadget_udc(dev->dev, &dev->gadget); + if (ret) + goto err_add_udc; + return 0; +err_add_udc: + device_remove_file(dev->dev, &dev_attr_registers); err_dev_reg: device_unregister(&dev->gadget.dev); err_irq: |