diff options
| author |   Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-07 09:53:17 +0200 |
|---|---|---|
| committer |   Felipe Balbi <balbi@ti.com> | 2012-09-10 15:35:41 +0300 |
| commit | ffe0b335062505a98d7296dae2c2a197713f87e0 (patch) | |
| tree | c2fe75a9711026ee65409034dd71579bad64a801 /drivers/usb/gadget/udc-core.c | |
| parent | staging: ccg: include all sourced files (diff) | |
| download | linux-dev-ffe0b335062505a98d7296dae2c2a197713f87e0.tar.xz linux-dev-ffe0b335062505a98d7296dae2c2a197713f87e0.zip | |
usb: gadget: remove global variable composite in composite.c
This patch removes the global variable composite in composite.c.
The private data which was saved there is now passed via an additional
argument to the bind() function in struct usb_gadget_driver.
Only the "old-style" UDC drivers have to be touched here, new style are
doing it right because this change is made in udc-core.
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/udc-core.c')
| -rw-r--r-- | drivers/usb/gadget/udc-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c index 85e1e2fdd403..f3cd9690b101 100644 --- a/drivers/usb/gadget/udc-core.c +++ b/drivers/usb/gadget/udc-core.c @@ -118,7 +118,7 @@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_request); */ static inline int usb_gadget_start(struct usb_gadget *gadget, struct usb_gadget_driver *driver, - int (*bind)(struct usb_gadget *)) + int (*bind)(struct usb_gadget *, struct usb_gadget_driver *)) { return gadget->ops->start(driver, bind); } @@ -338,7 +338,7 @@ found: udc->dev.driver = &driver->driver; if (udc_is_newstyle(udc)) { - ret = driver->bind(udc->gadget); + ret = driver->bind(udc->gadget, driver); if (ret) goto err1; ret = usb_gadget_udc_start(udc->gadget, driver); |