summaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/f_uac1.c
diff options
context:
space:
mode:
authorJassi Brar <jaswinder.singh@linaro.org>2012-02-02 22:01:12 +0530
committerFelipe Balbi <balbi@ti.com>2012-02-15 10:10:25 +0200
commitd747a916872241daef68c864ef09f8bef0c35bf8 (patch)
tree39106b6ea77fd7d2e954eccfe6ee13da705ee5e7 /drivers/usb/gadget/f_uac1.c
parent0d4e1b2a7eb7f4db8b3dc1c7ef4b507040f87ded (diff)
downloadblackbird-obmc-linux-d747a916872241daef68c864ef09f8bef0c35bf8.tar.gz
blackbird-obmc-linux-d747a916872241daef68c864ef09f8bef0c35bf8.zip
usb: gadget: audio: Move string IDs to audio.c
Move manufacturer and product string ids into audio.c so as to be reusable by the new uac2 version of gadget driver. Signed-off-by: Yadi Brar <yadi.brar01@gmail.com> Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/f_uac1.c')
-rw-r--r--drivers/usb/gadget/f_uac1.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/usb/gadget/f_uac1.c b/drivers/usb/gadget/f_uac1.c
index e4c060fd81e4..1a5dcd5565e3 100644
--- a/drivers/usb/gadget/f_uac1.c
+++ b/drivers/usb/gadget/f_uac1.c
@@ -216,29 +216,6 @@ static struct usb_descriptor_header *f_audio_desc[] __initdata = {
NULL,
};
-/* string IDs are assigned dynamically */
-
-#define STRING_MANUFACTURER_IDX 0
-#define STRING_PRODUCT_IDX 1
-
-static char manufacturer[50];
-
-static struct usb_string strings_dev[] = {
- [STRING_MANUFACTURER_IDX].s = manufacturer,
- [STRING_PRODUCT_IDX].s = DRIVER_DESC,
- { } /* end of list */
-};
-
-static struct usb_gadget_strings stringtab_dev = {
- .language = 0x0409, /* en-us */
- .strings = strings_dev,
-};
-
-static struct usb_gadget_strings *audio_strings[] = {
- &stringtab_dev,
- NULL,
-};
-
/*
* This function is an ALSA sound card following USB Audio Class Spec 1.0.
*/
OpenPOWER on IntegriCloud