aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/mass_storage.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/mass_storage.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/mass_storage.c')
-rw-r--r--drivers/usb/gadget/mass_storage.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
index 5df117e3f78d..480edbc368e5 100644
--- a/drivers/usb/gadget/mass_storage.c
+++ b/drivers/usb/gadget/mass_storage.c
@@ -162,6 +162,7 @@ static __refdata struct usb_composite_driver msg_driver = {
162 .iProduct = DRIVER_DESC, 162 .iProduct = DRIVER_DESC,
163 .max_speed = USB_SPEED_SUPER, 163 .max_speed = USB_SPEED_SUPER,
164 .needs_serial = 1, 164 .needs_serial = 1,
165 .bind = msg_bind,
165}; 166};
166 167
167MODULE_DESCRIPTION(DRIVER_DESC); 168MODULE_DESCRIPTION(DRIVER_DESC);
@@ -170,7 +171,7 @@ MODULE_LICENSE("GPL");
170 171
171static int __init msg_init(void) 172static int __init msg_init(void)
172{ 173{
173 return usb_composite_probe(&msg_driver, msg_bind); 174 return usb_composite_probe(&msg_driver);
174} 175}
175module_init(msg_init); 176module_init(msg_init);
176 177