usb: gadget: remove string override from struct usb_composite_driver

The struct usb_composite_driver members iProduct, iSerial and
iManufacturer can be entered directly via the string array. There is no
need for them to appear here.

Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
index 6f5a3b232d81..50da3c88cb06 100644
--- a/drivers/usb/gadget/mass_storage.c
+++ b/drivers/usb/gadget/mass_storage.c
@@ -85,7 +85,7 @@ static const struct usb_descriptor_header *otg_desc[] = {
 
 static struct usb_string strings_dev[] = {
         [USB_GADGET_MANUFACTURER_IDX].s = "",
-        [USB_GADGET_PRODUCT_IDX].s = "",
+        [USB_GADGET_PRODUCT_IDX].s = DRIVER_DESC,
         [USB_GADGET_SERIAL_IDX].s = "",
         {  } /* end of list */
 };
@@ -160,6 +160,7 @@ static int __init msg_bind(struct usb_composite_dev *cdev)
         status = usb_string_ids_tab(cdev, strings_dev);
         if (status < 0)
                 return status;
+        msg_device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;
 
         status = usb_add_config(cdev, &msg_config_driver, msg_do_config);
         if (status < 0)
@@ -177,7 +178,6 @@ static int __init msg_bind(struct usb_composite_dev *cdev)
 static __refdata struct usb_composite_driver msg_driver = {
         .name           = "g_mass_storage",
         .dev            = &msg_device_desc,
-        .iProduct       = DRIVER_DESC,
         .max_speed      = USB_SPEED_SUPER,
         .needs_serial   = 1,
         .strings        = dev_strings,