aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/multi.c
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-09-06 14:11:04 -0400
committerFelipe Balbi <balbi@ti.com>2012-09-10 08:34:48 -0400
commit03e42bd5937c4c24e411690ab165627e93c258b5 (patch)
treeb28ce26b26167ceeb4d3dc83dc424fd2e2ecb973 /drivers/usb/gadget/multi.c
parentc2ec75c25112c9e0d9053f55ba8cf0a358d4a354 (diff)
usb: gadget: move bind() callback back to struct usb_composite_driver
This partly reverts 07a18bd7 ("usb gadget: don't save bind callback in struct usb_composite_driver") and fixes new drivers. The section missmatch problems was solved by whitelisting structs in question via __ref. Cc: devel@driverdev.osuosl.org 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/multi.c')
-rw-r--r--drivers/usb/gadget/multi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index 7e5852a28a93..13db7ccb9571 100644
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -343,6 +343,7 @@ static __refdata struct usb_composite_driver multi_driver = {
343 .dev = &device_desc, 343 .dev = &device_desc,
344 .strings = dev_strings, 344 .strings = dev_strings,
345 .max_speed = USB_SPEED_HIGH, 345 .max_speed = USB_SPEED_HIGH,
346 .bind = multi_bind,
346 .unbind = __exit_p(multi_unbind), 347 .unbind = __exit_p(multi_unbind),
347 .iProduct = DRIVER_DESC, 348 .iProduct = DRIVER_DESC,
348 .needs_serial = 1, 349 .needs_serial = 1,
@@ -351,7 +352,7 @@ static __refdata struct usb_composite_driver multi_driver = {
351 352
352static int __init multi_init(void) 353static int __init multi_init(void)
353{ 354{
354 return usb_composite_probe(&multi_driver, multi_bind); 355 return usb_composite_probe(&multi_driver);
355} 356}
356module_init(multi_init); 357module_init(multi_init);
357 358