aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>2012-10-22 16:15:09 -0400
committerFelipe Balbi <balbi@ti.com>2012-10-31 09:10:37 -0400
commitb36c347966160ecfe420cd47a5a1f81ddaffc007 (patch)
tree00c37dfb60f2fcc461f90e9dce891e20f5a9aa9e /drivers
parent4ce63571d6a34e151f1525d2dcb5559293d8ad54 (diff)
usb: gadget: uac2: use the strings directly
There is no need for this variable in between. Acked-by: Jassi Brar <jassisinghbrar@gmail.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/gadget/f_uac2.c30
1 files changed, 10 insertions, 20 deletions
diff --git a/drivers/usb/gadget/f_uac2.c b/drivers/usb/gadget/f_uac2.c
index 503dd9782592..2840f1819065 100644
--- a/drivers/usb/gadget/f_uac2.c
+++ b/drivers/usb/gadget/f_uac2.c
@@ -520,32 +520,22 @@ enum {
520 STR_AS_IN_ALT1, 520 STR_AS_IN_ALT1,
521}; 521};
522 522
523static const char ifassoc[] = "Source/Sink";
524static const char ifctrl[] = "Topology Control";
525static char clksrc_in[8]; 523static char clksrc_in[8];
526static char clksrc_out[8]; 524static char clksrc_out[8];
527static const char usb_it[] = "USBH Out";
528static const char io_it[] = "USBD Out";
529static const char usb_ot[] = "USBH In";
530static const char io_ot[] = "USBD In";
531static const char out_alt0[] = "Playback Inactive";
532static const char out_alt1[] = "Playback Active";
533static const char in_alt0[] = "Capture Inactive";
534static const char in_alt1[] = "Capture Active";
535 525
536static struct usb_string strings_fn[] = { 526static struct usb_string strings_fn[] = {
537 [STR_ASSOC].s = ifassoc, 527 [STR_ASSOC].s = "Source/Sink",
538 [STR_IF_CTRL].s = ifctrl, 528 [STR_IF_CTRL].s = "Topology Control",
539 [STR_CLKSRC_IN].s = clksrc_in, 529 [STR_CLKSRC_IN].s = clksrc_in,
540 [STR_CLKSRC_OUT].s = clksrc_out, 530 [STR_CLKSRC_OUT].s = clksrc_out,
541 [STR_USB_IT].s = usb_it, 531 [STR_USB_IT].s = "USBH Out",
542 [STR_IO_IT].s = io_it, 532 [STR_IO_IT].s = "USBD Out",
543 [STR_USB_OT].s = usb_ot, 533 [STR_USB_OT].s = "USBH In",
544 [STR_IO_OT].s = io_ot, 534 [STR_IO_OT].s = "USBD In",
545 [STR_AS_OUT_ALT0].s = out_alt0, 535 [STR_AS_OUT_ALT0].s = "Playback Inactive",
546 [STR_AS_OUT_ALT1].s = out_alt1, 536 [STR_AS_OUT_ALT1].s = "Playback Active",
547 [STR_AS_IN_ALT0].s = in_alt0, 537 [STR_AS_IN_ALT0].s = "Capture Inactive",
548 [STR_AS_IN_ALT1].s = in_alt1, 538 [STR_AS_IN_ALT1].s = "Capture Active",
549 { }, 539 { },
550}; 540};
551 541