diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-08-12 11:43:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-22 13:21:26 -0400 |
commit | c9bfff9c98671ad50e4abbfe1ab606a9957f7539 (patch) | |
tree | 68ca78391c78bde1a82000e34eec70866f5c956e /drivers/usb/gadget/mass_storage.c | |
parent | 07a18bd716ed5dea336429404b132568cfaaef95 (diff) |
usb gadget: don't save bind callback in struct usb_configuration
The bind function is most of the time only called at init time so there
is no need to save a pointer to it in the configuration structure.
This fixes many section mismatches reported by modpost.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
[m.nazarewicz@samsung.com: updated for -next]
Signed-off-by: Michał Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/mass_storage.c')
-rw-r--r-- | drivers/usb/gadget/mass_storage.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c index a5e4a777d922..0769179dbdb0 100644 --- a/drivers/usb/gadget/mass_storage.c +++ b/drivers/usb/gadget/mass_storage.c | |||
@@ -141,7 +141,6 @@ static int __init msg_do_config(struct usb_configuration *c) | |||
141 | 141 | ||
142 | static struct usb_configuration msg_config_driver = { | 142 | static struct usb_configuration msg_config_driver = { |
143 | .label = "Linux File-Backed Storage", | 143 | .label = "Linux File-Backed Storage", |
144 | .bind = msg_do_config, | ||
145 | .bConfigurationValue = 1, | 144 | .bConfigurationValue = 1, |
146 | .bmAttributes = USB_CONFIG_ATT_SELFPOWER, | 145 | .bmAttributes = USB_CONFIG_ATT_SELFPOWER, |
147 | }; | 146 | }; |
@@ -153,7 +152,7 @@ static int __init msg_bind(struct usb_composite_dev *cdev) | |||
153 | { | 152 | { |
154 | int status; | 153 | int status; |
155 | 154 | ||
156 | status = usb_add_config(cdev, &msg_config_driver); | 155 | status = usb_add_config(cdev, &msg_config_driver, msg_do_config); |
157 | if (status < 0) | 156 | if (status < 0) |
158 | return status; | 157 | return status; |
159 | 158 | ||