diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-06 14:11:04 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-09-10 08:34:48 -0400 |
commit | 03e42bd5937c4c24e411690ab165627e93c258b5 (patch) | |
tree | b28ce26b26167ceeb4d3dc83dc424fd2e2ecb973 /drivers/usb/gadget/nokia.c | |
parent | c2ec75c25112c9e0d9053f55ba8cf0a358d4a354 (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/nokia.c')
-rw-r--r-- | drivers/usb/gadget/nokia.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/nokia.c b/drivers/usb/gadget/nokia.c index 936d0afc4527..a5b5e7162fef 100644 --- a/drivers/usb/gadget/nokia.c +++ b/drivers/usb/gadget/nokia.c | |||
@@ -242,12 +242,13 @@ static __refdata struct usb_composite_driver nokia_driver = { | |||
242 | .dev = &device_desc, | 242 | .dev = &device_desc, |
243 | .strings = dev_strings, | 243 | .strings = dev_strings, |
244 | .max_speed = USB_SPEED_HIGH, | 244 | .max_speed = USB_SPEED_HIGH, |
245 | .bind = nokia_bind, | ||
245 | .unbind = __exit_p(nokia_unbind), | 246 | .unbind = __exit_p(nokia_unbind), |
246 | }; | 247 | }; |
247 | 248 | ||
248 | static int __init nokia_init(void) | 249 | static int __init nokia_init(void) |
249 | { | 250 | { |
250 | return usb_composite_probe(&nokia_driver, nokia_bind); | 251 | return usb_composite_probe(&nokia_driver); |
251 | } | 252 | } |
252 | module_init(nokia_init); | 253 | module_init(nokia_init); |
253 | 254 | ||