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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
07a18bd716
commit
c9bfff9c98
@@ -251,7 +251,6 @@ static int __init rndis_do_config(struct usb_configuration *c)
|
||||
|
||||
static struct usb_configuration rndis_config_driver = {
|
||||
.label = "RNDIS",
|
||||
.bind = rndis_do_config,
|
||||
.bConfigurationValue = 2,
|
||||
/* .iConfiguration = DYNAMIC */
|
||||
.bmAttributes = USB_CONFIG_ATT_SELFPOWER,
|
||||
@@ -289,7 +288,6 @@ static int __init eth_do_config(struct usb_configuration *c)
|
||||
|
||||
static struct usb_configuration eth_config_driver = {
|
||||
/* .label = f(hardware) */
|
||||
.bind = eth_do_config,
|
||||
.bConfigurationValue = 1,
|
||||
/* .iConfiguration = DYNAMIC */
|
||||
.bmAttributes = USB_CONFIG_ATT_SELFPOWER,
|
||||
@@ -373,12 +371,13 @@ static int __init eth_bind(struct usb_composite_dev *cdev)
|
||||
|
||||
/* register our configuration(s); RNDIS first, if it's used */
|
||||
if (has_rndis()) {
|
||||
status = usb_add_config(cdev, &rndis_config_driver);
|
||||
status = usb_add_config(cdev, &rndis_config_driver,
|
||||
rndis_do_config);
|
||||
if (status < 0)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
status = usb_add_config(cdev, ð_config_driver);
|
||||
status = usb_add_config(cdev, ð_config_driver, eth_do_config);
|
||||
if (status < 0)
|
||||
goto fail;
|
||||
|
||||
|
Reference in New Issue
Block a user