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/g_ffs.c b/drivers/usb/gadget/g_ffs.c
index 16d18873ebeb..eaaed199e453 100644
--- a/drivers/usb/gadget/g_ffs.c
+++ b/drivers/usb/gadget/g_ffs.c
@@ -117,7 +117,7 @@ static const struct usb_descriptor_header *gfs_otg_desc[] = {
 /* String IDs are assigned dynamically */
 static struct usb_string gfs_strings[] = {
         [USB_GADGET_MANUFACTURER_IDX].s = "",
-        [USB_GADGET_PRODUCT_IDX].s = "",
+        [USB_GADGET_PRODUCT_IDX].s = DRIVER_DESC,
         [USB_GADGET_SERIAL_IDX].s = "",
 #ifdef CONFIG_USB_FUNCTIONFS_RNDIS
         { .s = "FunctionFS + RNDIS" },
@@ -172,7 +172,6 @@ static __refdata struct usb_composite_driver gfs_driver = {
         .max_speed      = USB_SPEED_HIGH,
         .bind           = gfs_bind,
         .unbind         = gfs_unbind,
-        .iProduct       = DRIVER_DESC,
 };
 
 static DEFINE_MUTEX(gfs_lock);
@@ -360,6 +359,7 @@ static int gfs_bind(struct usb_composite_dev *cdev)
         ret = usb_string_ids_tab(cdev, gfs_strings);
         if (unlikely(ret < 0))
                 goto error;
+        gfs_dev_desc.iProduct = gfs_strings[USB_GADGET_PRODUCT_IDX].id;
 
         for (i = func_num; --i; ) {
                 ret = functionfs_bind(ffs_tab[i].ffs_data, cdev);