aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/ncm.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/ncm.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/ncm.c')
-rw-r--r--drivers/usb/gadget/ncm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/ncm.c b/drivers/usb/gadget/ncm.c
index 5079bf659e31..9a20057896cd 100644
--- a/drivers/usb/gadget/ncm.c
+++ b/drivers/usb/gadget/ncm.c
@@ -220,6 +220,7 @@ static __refdata struct usb_composite_driver ncm_driver = {
220 .dev = &device_desc, 220 .dev = &device_desc,
221 .strings = dev_strings, 221 .strings = dev_strings,
222 .max_speed = USB_SPEED_HIGH, 222 .max_speed = USB_SPEED_HIGH,
223 .bind = gncm_bind,
223 .unbind = __exit_p(gncm_unbind), 224 .unbind = __exit_p(gncm_unbind),
224}; 225};
225 226
@@ -229,7 +230,7 @@ MODULE_LICENSE("GPL");
229 230
230static int __init init(void) 231static int __init init(void)
231{ 232{
232 return usb_composite_probe(&ncm_driver, gncm_bind); 233 return usb_composite_probe(&ncm_driver);
233} 234}
234module_init(init); 235module_init(init);
235 236