aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/acm_ms.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/acm_ms.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/acm_ms.c')
-rw-r--r--drivers/usb/gadget/acm_ms.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/acm_ms.c b/drivers/usb/gadget/acm_ms.c
index dc5cd51de7d4..65a2f3cbcde3 100644
--- a/drivers/usb/gadget/acm_ms.c
+++ b/drivers/usb/gadget/acm_ms.c
@@ -237,6 +237,7 @@ static __refdata struct usb_composite_driver acm_ms_driver = {
237 .dev = &device_desc, 237 .dev = &device_desc,
238 .max_speed = USB_SPEED_SUPER, 238 .max_speed = USB_SPEED_SUPER,
239 .strings = dev_strings, 239 .strings = dev_strings,
240 .bind = acm_ms_bind,
240 .unbind = __exit_p(acm_ms_unbind), 241 .unbind = __exit_p(acm_ms_unbind),
241}; 242};
242 243
@@ -246,7 +247,7 @@ MODULE_LICENSE("GPL v2");
246 247
247static int __init init(void) 248static int __init init(void)
248{ 249{
249 return usb_composite_probe(&acm_ms_driver, acm_ms_bind); 250 return usb_composite_probe(&acm_ms_driver);
250} 251}
251module_init(init); 252module_init(init);
252 253