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/audio.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/audio.c')
-rw-r--r-- | drivers/usb/gadget/audio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/audio.c b/drivers/usb/gadget/audio.c index 5a65fbb4e20b..93b999e49ef3 100644 --- a/drivers/usb/gadget/audio.c +++ b/drivers/usb/gadget/audio.c | |||
@@ -105,7 +105,6 @@ static int __init audio_do_config(struct usb_configuration *c) | |||
105 | 105 | ||
106 | static struct usb_configuration audio_config_driver = { | 106 | static struct usb_configuration audio_config_driver = { |
107 | .label = DRIVER_DESC, | 107 | .label = DRIVER_DESC, |
108 | .bind = audio_do_config, | ||
109 | .bConfigurationValue = 1, | 108 | .bConfigurationValue = 1, |
110 | /* .iConfiguration = DYNAMIC */ | 109 | /* .iConfiguration = DYNAMIC */ |
111 | .bmAttributes = USB_CONFIG_ATT_SELFPOWER, | 110 | .bmAttributes = USB_CONFIG_ATT_SELFPOWER, |
@@ -145,7 +144,7 @@ static int __init audio_bind(struct usb_composite_dev *cdev) | |||
145 | strings_dev[STRING_PRODUCT_IDX].id = status; | 144 | strings_dev[STRING_PRODUCT_IDX].id = status; |
146 | device_desc.iProduct = status; | 145 | device_desc.iProduct = status; |
147 | 146 | ||
148 | status = usb_add_config(cdev, &audio_config_driver); | 147 | status = usb_add_config(cdev, &audio_config_driver, audio_do_config); |
149 | if (status < 0) | 148 | if (status < 0) |
150 | goto fail; | 149 | goto fail; |
151 | 150 | ||