Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c94e289f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Felipe Balbi
Browse files

usb: gadget: remove incorrect __init/__exit annotations 



A recent change introduced a link error for the composite
printer gadget driver:

`printer_unbind' referenced in section `.ref.data' of drivers/built-in.o: defined in discarded section `.exit.text' of drivers/built-in.o

Evidently the unbind function should not be marked __exit here,
because it is called through a callback pointer that is not necessarily
discarded, __composite_unbind() is indeed called from the error path of
composite_bind(), which can never work for a built-in driver.

Looking at the surrounding code, I found the same problem in all other
composite gadget drivers in both the bind and unbind functions, as
well as the udc platform driver 'remove' functions. Those will break
if anyone uses the 'unbind' sysfs attribute to detach a device from a
built-in driver.

This patch removes the incorrect annotations from all the gadget
drivers.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 197d0bdf

drivers/usb/gadget/legacy/acm_ms.c

+5 −5
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static struct usb_function *f_msg; 
/*

 * We _always_ have both ACM and mass storage functions.

 */

static int __init acm_ms_do_config(struct usb_configuration *c)

static int acm_ms_do_config(struct usb_configuration *c)

{

	struct fsg_opts *opts;

	int	status;
@@ -174,7 +174,7 @@ static struct usb_configuration acm_ms_config_driver = { 


/*-------------------------------------------------------------------------*/



static int __init acm_ms_bind(struct usb_composite_dev *cdev)

static int acm_ms_bind(struct usb_composite_dev *cdev)

{

	struct usb_gadget	*gadget = cdev->gadget;

	struct fsg_opts		*opts;
@@ -249,7 +249,7 @@ fail_get_msg: 
	return status;

}



static int __exit acm_ms_unbind(struct usb_composite_dev *cdev)

static int acm_ms_unbind(struct usb_composite_dev *cdev)

{

	usb_put_function(f_msg);

	usb_put_function_instance(fi_msg);
@@ -258,13 +258,13 @@ static int __exit acm_ms_unbind(struct usb_composite_dev *cdev) 
	return 0;

}



static __refdata struct usb_composite_driver acm_ms_driver = {

static struct usb_composite_driver acm_ms_driver = {

	.name		= "g_acm_ms",

	.dev		= &device_desc,

	.max_speed	= USB_SPEED_SUPER,

	.strings	= dev_strings,

	.bind		= acm_ms_bind,

	.unbind		= __exit_p(acm_ms_unbind),

	.unbind		= acm_ms_unbind,

};



module_usb_composite_driver(acm_ms_driver);

drivers/usb/gadget/legacy/audio.c

+5 −5
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static const struct usb_descriptor_header *otg_desc[] = { 


/*-------------------------------------------------------------------------*/



static int __init audio_do_config(struct usb_configuration *c)

static int audio_do_config(struct usb_configuration *c)

{

	int status;
@@ -216,7 +216,7 @@ static struct usb_configuration audio_config_driver = { 


/*-------------------------------------------------------------------------*/



static int __init audio_bind(struct usb_composite_dev *cdev)

static int audio_bind(struct usb_composite_dev *cdev)

{

#ifndef CONFIG_GADGET_UAC1

	struct f_uac2_opts	*uac2_opts;
@@ -276,7 +276,7 @@ fail: 
	return status;

}



static int __exit audio_unbind(struct usb_composite_dev *cdev)

static int audio_unbind(struct usb_composite_dev *cdev)

{

#ifdef CONFIG_GADGET_UAC1

	if (!IS_ERR_OR_NULL(f_uac1))
@@ -292,13 +292,13 @@ static int __exit audio_unbind(struct usb_composite_dev *cdev) 
	return 0;

}



static __refdata struct usb_composite_driver audio_driver = {

static struct usb_composite_driver audio_driver = {

	.name		= "g_audio",

	.dev		= &device_desc,

	.strings	= audio_strings,

	.max_speed	= USB_SPEED_HIGH,

	.bind		= audio_bind,

	.unbind		= __exit_p(audio_unbind),

	.unbind		= audio_unbind,

};



module_usb_composite_driver(audio_driver);

drivers/usb/gadget/legacy/cdc2.c

+5 −5
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static struct usb_function_instance *fi_ecm; 
/*

 * We _always_ have both CDC ECM and CDC ACM functions.

 */

static int __init cdc_do_config(struct usb_configuration *c)

static int cdc_do_config(struct usb_configuration *c)

{

	int	status;
@@ -153,7 +153,7 @@ static struct usb_configuration cdc_config_driver = { 


/*-------------------------------------------------------------------------*/



static int __init cdc_bind(struct usb_composite_dev *cdev)

static int cdc_bind(struct usb_composite_dev *cdev)

{

	struct usb_gadget	*gadget = cdev->gadget;

	struct f_ecm_opts	*ecm_opts;
@@ -211,7 +211,7 @@ fail: 
	return status;

}



static int __exit cdc_unbind(struct usb_composite_dev *cdev)

static int cdc_unbind(struct usb_composite_dev *cdev)

{

	usb_put_function(f_acm);

	usb_put_function_instance(fi_serial);
@@ -222,13 +222,13 @@ static int __exit cdc_unbind(struct usb_composite_dev *cdev) 
	return 0;

}



static __refdata struct usb_composite_driver cdc_driver = {

static struct usb_composite_driver cdc_driver = {

	.name		= "g_cdc",

	.dev		= &device_desc,

	.strings	= dev_strings,

	.max_speed	= USB_SPEED_HIGH,

	.bind		= cdc_bind,

	.unbind		= __exit_p(cdc_unbind),

	.unbind		= cdc_unbind,

};



module_usb_composite_driver(cdc_driver);

drivers/usb/gadget/legacy/dbgp.c

+2 −2
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ fail_1: 
	return -ENODEV;

}



static int __init dbgp_bind(struct usb_gadget *gadget,

static int dbgp_bind(struct usb_gadget *gadget,

		struct usb_gadget_driver *driver)

{

	int err, stp;
@@ -406,7 +406,7 @@ fail: 
	return err;

}



static __refdata struct usb_gadget_driver dbgp_driver = {

static struct usb_gadget_driver dbgp_driver = {

	.function = "dbgp",

	.max_speed = USB_SPEED_HIGH,

	.bind = dbgp_bind,

drivers/usb/gadget/legacy/ether.c

+6 −6
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static struct usb_function *f_rndis; 
 * the first one present.  That's to make Microsoft's drivers happy,

 * and to follow DOCSIS 1.0 (cable modem standard).

 */

static int __init rndis_do_config(struct usb_configuration *c)

static int rndis_do_config(struct usb_configuration *c)

{

	int status;
@@ -264,7 +264,7 @@ MODULE_PARM_DESC(use_eem, "use CDC EEM mode"); 
/*

 * We _always_ have an ECM, CDC Subset, or EEM configuration.

 */

static int __init eth_do_config(struct usb_configuration *c)

static int eth_do_config(struct usb_configuration *c)

{

	int status = 0;
@@ -318,7 +318,7 @@ static struct usb_configuration eth_config_driver = { 


/*-------------------------------------------------------------------------*/



static int __init eth_bind(struct usb_composite_dev *cdev)

static int eth_bind(struct usb_composite_dev *cdev)

{

	struct usb_gadget	*gadget = cdev->gadget;

	struct f_eem_opts	*eem_opts = NULL;
@@ -447,7 +447,7 @@ fail: 
	return status;

}



static int __exit eth_unbind(struct usb_composite_dev *cdev)

static int eth_unbind(struct usb_composite_dev *cdev)

{

	if (has_rndis()) {

		usb_put_function(f_rndis);
@@ -466,13 +466,13 @@ static int __exit eth_unbind(struct usb_composite_dev *cdev) 
	return 0;

}



static __refdata struct usb_composite_driver eth_driver = {

static struct usb_composite_driver eth_driver = {

	.name		= "g_ether",

	.dev		= &device_desc,

	.strings	= dev_strings,

	.max_speed	= USB_SPEED_SUPER,

	.bind		= eth_bind,

	.unbind		= __exit_p(eth_unbind),

	.unbind		= eth_unbind,

};



module_usb_composite_driver(eth_driver);