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

Commit e12995ec authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Greg Kroah-Hartman
Browse files

USB: Revert "USB: gadget: section mismatch warning fixed" 



This reverts a commit which proposed an invalid solution
for a section mismatch.  Next 3 commits will fix it correctly.

Conflicts:

	drivers/usb/gadget/mass_storage.c

Signed-off-by: default avatarMichal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a99d8a45

drivers/usb/gadget/audio.c

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




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

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





static int __ref audio_do_config(struct usb_configuration *c)

static int __init audio_do_config(struct usb_configuration *c)

{

{

	/* FIXME alloc iConfiguration string, set it in c->strings */

	/* FIXME alloc iConfiguration string, set it in c->strings */
@@ -113,7 +113,7 @@ static struct usb_configuration audio_config_driver = { 




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

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





static int __ref audio_bind(struct usb_composite_dev *cdev)

static int __init audio_bind(struct usb_composite_dev *cdev)

{

{

	int			gcnum;

	int			gcnum;

	int			status;

	int			status;

drivers/usb/gadget/cdc2.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -129,7 +129,7 @@ static u8 hostaddr[ETH_ALEN]; 
/*

/*

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

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

 */

 */

static int __ref cdc_do_config(struct usb_configuration *c)

static int __init cdc_do_config(struct usb_configuration *c)

{

{

	int	status;

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




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

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





static int __ref cdc_bind(struct usb_composite_dev *cdev)

static int __init cdc_bind(struct usb_composite_dev *cdev)

{

{

	int			gcnum;

	int			gcnum;

	struct usb_gadget	*gadget = cdev->gadget;

	struct usb_gadget	*gadget = cdev->gadget;

drivers/usb/gadget/ether.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -237,7 +237,7 @@ static u8 hostaddr[ETH_ALEN]; 
 * the first one present.  That's to make Microsoft's drivers happy,

 * the first one present.  That's to make Microsoft's drivers happy,

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

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

 */

 */

static int __ref rndis_do_config(struct usb_configuration *c)

static int __init rndis_do_config(struct usb_configuration *c)

{

{

	/* FIXME alloc iConfiguration string, set it in c->strings */

	/* FIXME alloc iConfiguration string, set it in c->strings */
@@ -270,7 +270,7 @@ MODULE_PARM_DESC(use_eem, "use CDC EEM mode"); 
/*

/*

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

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

 */

 */

static int __ref eth_do_config(struct usb_configuration *c)

static int __init eth_do_config(struct usb_configuration *c)

{

{

	/* FIXME alloc iConfiguration string, set it in c->strings */

	/* FIXME alloc iConfiguration string, set it in c->strings */
@@ -297,7 +297,7 @@ static struct usb_configuration eth_config_driver = { 




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

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





static int __ref eth_bind(struct usb_composite_dev *cdev)

static int __init eth_bind(struct usb_composite_dev *cdev)

{

{

	int			gcnum;

	int			gcnum;

	struct usb_gadget	*gadget = cdev->gadget;

	struct usb_gadget	*gadget = cdev->gadget;

drivers/usb/gadget/f_loopback.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -324,7 +324,7 @@ static void loopback_disable(struct usb_function *f) 




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

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





static int __ref loopback_bind_config(struct usb_configuration *c)

static int __init loopback_bind_config(struct usb_configuration *c)

{

{

	struct f_loopback	*loop;

	struct f_loopback	*loop;

	int			status;

	int			status;

drivers/usb/gadget/f_sourcesink.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -404,7 +404,7 @@ static void sourcesink_disable(struct usb_function *f) 




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

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





static int __ref sourcesink_bind_config(struct usb_configuration *c)

static int __init sourcesink_bind_config(struct usb_configuration *c)

{

{

	struct f_sourcesink	*ss;

	struct f_sourcesink	*ss;

	int			status;

	int			status;