diff options
| author | Peter Chen <peter.chen@freescale.com> | 2014-07-04 12:39:04 +0800 |
|---|---|---|
| committer | Peter Chen <peter.chen@freescale.com> | 2014-07-04 17:31:06 +0800 |
| commit | 463ada98906cee6035426bba377b7f9d0d2f979c (patch) | |
| tree | c0d194629939fd760ecff1edd5e883645e1073ea /drivers/usb/gadget/f_uac1.c | |
| parent | 295dcfe35d2708721917d136493b7a0cc84adb76 (diff) | |
ENGR00320792-1 Revert "usb: gadget: remove __init from gadget driver bind function"
This reverts commit 6d9f0704e3acf4b754188817974247c1963c1493.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Diffstat (limited to 'drivers/usb/gadget/f_uac1.c')
| -rw-r--r-- | drivers/usb/gadget/f_uac1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/gadget/f_uac1.c b/drivers/usb/gadget/f_uac1.c index e11f6cdbe27f..fa8ea4ea00c1 100644 --- a/drivers/usb/gadget/f_uac1.c +++ b/drivers/usb/gadget/f_uac1.c @@ -46,7 +46,7 @@ static int generic_get_cmd(struct usb_audio_control *con, u8 cmd); #define F_AUDIO_NUM_INTERFACES 2 /* B.3.1 Standard AC Interface Descriptor */ -static struct usb_interface_descriptor ac_interface_desc = { +static struct usb_interface_descriptor ac_interface_desc __initdata = { .bLength = USB_DT_INTERFACE_SIZE, .bDescriptorType = USB_DT_INTERFACE, .bNumEndpoints = 0, @@ -188,7 +188,7 @@ static struct usb_endpoint_descriptor as_out_ep_desc = { }; /* Class-specific AS ISO OUT Endpoint Descriptor */ -static struct uac_iso_endpoint_descriptor as_iso_out_desc = { +static struct uac_iso_endpoint_descriptor as_iso_out_desc __initdata = { .bLength = UAC_ISO_ENDPOINT_DESC_SIZE, .bDescriptorType = USB_DT_CS_ENDPOINT, .bDescriptorSubtype = UAC_EP_GENERAL, @@ -197,7 +197,7 @@ static struct uac_iso_endpoint_descriptor as_iso_out_desc = { .wLockDelay = __constant_cpu_to_le16(1), }; -static struct usb_descriptor_header *f_audio_desc[] = { +static struct usb_descriptor_header *f_audio_desc[] __initdata = { (struct usb_descriptor_header *)&ac_interface_desc, (struct usb_descriptor_header *)&ac_header_desc, @@ -625,7 +625,7 @@ static void f_audio_build_desc(struct f_audio *audio) } /* audio function driver setup/binding */ -static int +static int __init f_audio_bind(struct usb_configuration *c, struct usb_function *f) { struct usb_composite_dev *cdev = c->cdev; @@ -695,7 +695,7 @@ static int generic_get_cmd(struct usb_audio_control *con, u8 cmd) } /* Todo: add more control selecotor dynamically */ -int control_selector_init(struct f_audio *audio) +int __init control_selector_init(struct f_audio *audio) { INIT_LIST_HEAD(&audio->cs); list_add(&feature_unit.list, &audio->cs); @@ -719,7 +719,7 @@ int control_selector_init(struct f_audio *audio) * * Returns zero on success, else negative errno. */ -int audio_bind_config(struct usb_configuration *c) +int __init audio_bind_config(struct usb_configuration *c) { struct f_audio *audio; int status; |