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, 0 insertions, 12 deletions

diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 5cd110ec0a2..60f8815998b 100644
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -259,13 +259,6 @@ enum {
 /**
  * struct usb_composite_driver - groups configurations into a gadget
  * @name: For diagnostics, identifies the driver.
- * @iProduct: Used as iProduct override if @dev->iProduct is not set.
- *      If NULL value of @name is taken.
- * @iManufacturer: Used as iManufacturer override if @dev->iManufacturer is
- *      not set. If NULL a default "<system> <release> with <udc>" value
- *      will be used.
- * @iSerialNumber: Used as iSerialNumber override if @dev->iSerialNumber is
- *      not set.
  * @dev: Template descriptor for the device, including default device
  *      identifiers.
  * @strings: tables of strings, keyed by identifiers assigned during @bind
@@ -300,9 +293,6 @@ enum {
  */
 struct usb_composite_driver {
         const char                              *name;
-        const char                              *iProduct;
-        const char                              *iManufacturer;
-        const char                              *iSerialNumber;
         const struct usb_device_descriptor      *dev;
         struct usb_gadget_strings               **strings;
         enum usb_device_speed                   max_speed;
@@ -369,8 +359,6 @@ struct usb_composite_dev {
         struct usb_composite_driver     *driver;
         u8                              next_string_id;
         u8                              manufacturer_override;
-        u8                              product_override;
-        u8                              serial_override;
 
         /* the gadget driver won't enable the data pullup
          * while the deactivation count is nonzero.