Skip to content

Commit

Permalink
USB: Revert "USB: gadget: section mismatch warning fixed"
Browse files Browse the repository at this point in the history 
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: Michal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
@gregkh
Michal Nazarewicz authored and gregkh committed Oct 22, 2010
1 parent a99d8a4 commit e12995e
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/gadget/audio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand All @@ -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 status;
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/gadget/cdc2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static u8 hostaddr[ETH_ALEN];
/*
* 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;

Expand Down Expand Up @@ -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;
struct usb_gadget *gadget = cdev->gadget;
Expand Down
6 changes: 3 additions & 3 deletions drivers/usb/gadget/ether.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ static u8 hostaddr[ETH_ALEN];
* the first one present. That's to make Microsoft's drivers happy,
* 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 */

Expand Down Expand Up @@ -270,7 +270,7 @@ MODULE_PARM_DESC(use_eem, "use CDC EEM mode");
/*
* 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 */

Expand All @@ -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;
struct usb_gadget *gadget = cdev->gadget;
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/gadget/f_loopback.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
int status;
Expand All @@ -346,7 +346,7 @@ static int __ref loopback_bind_config(struct usb_configuration *c)
return status;
}

static struct usb_configuration loopback_driver = {
static struct usb_configuration loopback_driver = {
.label = "loopback",
.strings = loopback_strings,
.bind = loopback_bind_config,
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/f_sourcesink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
int status;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/file_storage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3348,7 +3348,7 @@ static int __init check_parameters(struct fsg_dev *fsg)
}


static int __ref fsg_bind(struct usb_gadget *gadget)
static int __init fsg_bind(struct usb_gadget *gadget)
{
struct fsg_dev *fsg = the_fsg;
int rc;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/gmidi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,7 @@ static int gmidi_register_card(struct gmidi_device *dev)
/*
* Creates an output endpoint, and initializes output ports.
*/
static int __ref gmidi_bind(struct usb_gadget *gadget)
static int __init gmidi_bind(struct usb_gadget *gadget)
{
struct gmidi_device *dev;
struct usb_ep *in_ep, *out_ep;
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/gadget/hid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static struct usb_gadget_strings *dev_strings[] = {

/****************************** Configurations ******************************/

static int __ref do_config(struct usb_configuration *c)
static int __init do_config(struct usb_configuration *c)
{
struct hidg_func_node *e;
int func = 0, status = 0;
Expand Down Expand Up @@ -156,7 +156,7 @@ static struct usb_configuration config_driver = {

/****************************** Gadget Bind ******************************/

static int __ref hid_bind(struct usb_composite_dev *cdev)
static int __init hid_bind(struct usb_composite_dev *cdev)
{
struct usb_gadget *gadget = cdev->gadget;
struct list_head *tmp;
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/gadget/mass_storage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ static int msg_thread_exits(struct fsg_common *common)
return 0;
}

static int __ref msg_do_config(struct usb_configuration *c)
static int __init msg_do_config(struct usb_configuration *c)
{
static const struct fsg_operations ops = {
.thread_exits = msg_thread_exits,
Expand Down Expand Up @@ -149,7 +149,7 @@ static struct usb_configuration msg_config_driver = {

/****************************** Gadget Bind ******************************/

static int __ref msg_bind(struct usb_composite_dev *cdev)
static int __init msg_bind(struct usb_composite_dev *cdev)
{
int status;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/printer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ printer_unbind(struct usb_gadget *gadget)
set_gadget_data(gadget, NULL);
}

static int __ref
static int __init
printer_bind(struct usb_gadget *gadget)
{
struct printer_dev *dev;
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/gadget/serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ MODULE_PARM_DESC(n_ports, "number of ports to create, default=1");

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

static int __ref serial_bind_config(struct usb_configuration *c)
static int __init serial_bind_config(struct usb_configuration *c)
{
unsigned i;
int status = 0;
Expand All @@ -161,7 +161,7 @@ static struct usb_configuration serial_config_driver = {
.bmAttributes = USB_CONFIG_ATT_SELFPOWER,
};

static int __ref gs_bind(struct usb_composite_dev *cdev)
static int __init gs_bind(struct usb_composite_dev *cdev)
{
int gcnum;
struct usb_gadget *gadget = cdev->gadget;
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/gadget/webcam.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ static const struct uvc_descriptor_header * const uvc_hs_streaming_cls[] = {
* USB configuration
*/

static int __ref
static int __init
webcam_config_bind(struct usb_configuration *c)
{
return uvc_bind_config(c, uvc_control_cls, uvc_fs_streaming_cls,
Expand All @@ -330,7 +330,7 @@ webcam_unbind(struct usb_composite_dev *cdev)
return 0;
}

static int __ref
static int __init
webcam_bind(struct usb_composite_dev *cdev)
{
int ret;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/zero.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ static void zero_resume(struct usb_composite_dev *cdev)

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

static int __ref zero_bind(struct usb_composite_dev *cdev)
static int __init zero_bind(struct usb_composite_dev *cdev)
{
int gcnum;
struct usb_gadget *gadget = cdev->gadget;
Expand Down

0 comments on commit e12995e

Please sign in to comment.