[PATCHv2 05/15] usb: gadget: tcm: split string definitions into function and device

[Andrzej Pietrasiewicz]

Prepare for factoring out f_tcm from a legacy gadget.

Signed-off-by: Andrzej Pietrasiewicz <andrze...@samsung.com>
---
 drivers/usb/gadget/legacy/tcm_usb_gadget.c | 25 +++++++++++++++++++++----
 drivers/usb/gadget/legacy/tcm_usb_gadget.h |  3 +--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/gadget/legacy/tcm_usb_gadget.c 
b/drivers/usb/gadget/legacy/tcm_usb_gadget.c
index cbba4b9..556decf 100644
--- a/drivers/usb/gadget/legacy/tcm_usb_gadget.c
+++ b/drivers/usb/gadget/legacy/tcm_usb_gadget.c
@@ -1990,13 +1990,13 @@ static struct usb_device_descriptor usbg_device_desc = {
        .bNumConfigurations =   1,
 };
 
+#define USB_G_STR_CONFIG USB_GADGET_FIRST_AVAIL_IDX
+
 static struct usb_string       usbg_us_strings[] = {
        [USB_GADGET_MANUFACTURER_IDX].s = "Target Manufactor",
        [USB_GADGET_PRODUCT_IDX].s      = "Target Product",
        [USB_GADGET_SERIAL_IDX].s       = "000000000001",
        [USB_G_STR_CONFIG].s            = "default config",
-       [USB_G_STR_INT_UAS].s           = "USB Attached SCSI",
-       [USB_G_STR_INT_BBB].s           = "Bulk Only Transport",
        { },
 };
 
@@ -2010,6 +2010,22 @@ static struct usb_gadget_strings *usbg_strings[] = {
        NULL,
 };
 
+static struct usb_string       tcm_us_strings[] = {
+       [USB_G_STR_INT_UAS].s           = "USB Attached SCSI",
+       [USB_G_STR_INT_BBB].s           = "Bulk Only Transport",
+       { },
+};
+
+static struct usb_gadget_strings tcm_stringtab = {
+       .language = 0x0409,
+       .strings = tcm_us_strings,
+};
+
+static struct usb_gadget_strings *tcm_strings[] = {
+       &tcm_stringtab,
+       NULL,
+};
+
 static int guas_unbind(struct usb_composite_dev *cdev)
 {
        return 0;
@@ -2192,10 +2208,11 @@ static int usbg_cfg_bind(struct usb_configuration *c)
        fu->function.set_alt = usbg_set_alt;
        fu->function.setup = usbg_setup;
        fu->function.disable = usbg_disable;
+       fu->function.strings = tcm_strings;
        fu->tpg = the_only_tpg_I_currently_have;
 
-       bot_intf_desc.iInterface = usbg_us_strings[USB_G_STR_INT_BBB].id;
-       uasp_intf_desc.iInterface = usbg_us_strings[USB_G_STR_INT_UAS].id;
+       bot_intf_desc.iInterface = tcm_us_strings[USB_G_STR_INT_BBB].id;
+       uasp_intf_desc.iInterface = tcm_us_strings[USB_G_STR_INT_UAS].id;
 
        ret = usb_add_function(c, &fu->function);
        if (ret)
diff --git a/drivers/usb/gadget/legacy/tcm_usb_gadget.h 
b/drivers/usb/gadget/legacy/tcm_usb_gadget.h
index 0b749e1..f1b69e2 100644
--- a/drivers/usb/gadget/legacy/tcm_usb_gadget.h
+++ b/drivers/usb/gadget/legacy/tcm_usb_gadget.h
@@ -16,8 +16,7 @@
 #define UASP_SS_EP_COMP_NUM_STREAMS (1 << UASP_SS_EP_COMP_LOG_STREAMS)
 
 enum {
-       USB_G_STR_CONFIG = USB_GADGET_FIRST_AVAIL_IDX,
-       USB_G_STR_INT_UAS,
+       USB_G_STR_INT_UAS = 0,
        USB_G_STR_INT_BBB,
 };
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html