USB: gadget: g_multi: moved strings handling code to composite

[karo-tx-linux.git] / drivers / usb / gadget / multi.c

diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index 795d7623216762e0a8ab6631d55e78d07901550e..ca51661d71db27b839f2b1105e6286bdd6901023 100644 (file)
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -74,8 +74,8 @@ MODULE_LICENSE("GPL");
 
 /***************************** Device Descriptor ****************************/
 
-#define MULTI_VENDOR_NUM       0x0525  /* XXX NetChip */
-#define MULTI_PRODUCT_NUM      0xa4ab  /* XXX */
+#define MULTI_VENDOR_NUM       0x1d6b  /* Linux Foundation */
+#define MULTI_PRODUCT_NUM      0x0104  /* Multifunction Composite Gadget */
 
 
 enum {
@@ -121,8 +121,6 @@ static const struct usb_descriptor_header *otg_desc[] = {
 
 
 enum {
-       MULTI_STRING_MANUFACTURER_IDX,
-       MULTI_STRING_PRODUCT_IDX,
 #ifdef CONFIG_USB_G_MULTI_RNDIS
        MULTI_STRING_RNDIS_CONFIG_IDX,
 #endif
@@ -131,11 +129,7 @@ enum {
 #endif
 };
 
-static char manufacturer[50];
-
 static struct usb_string strings_dev[] = {
-       [MULTI_STRING_MANUFACTURER_IDX].s = manufacturer,
-       [MULTI_STRING_PRODUCT_IDX].s      = DRIVER_DESC,
 #ifdef CONFIG_USB_G_MULTI_RNDIS
        [MULTI_STRING_RNDIS_CONFIG_IDX].s = "Multifunction with RNDIS",
 #endif
@@ -314,20 +308,11 @@ static int __ref multi_bind(struct usb_composite_dev *cdev)
                device_desc.bcdDevice = cpu_to_le16(0x0300 | 0x0099);
        }
 
-       /* allocate string descriptor numbers */
-       snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",
-                init_utsname()->sysname, init_utsname()->release,
-                gadget->name);
-
+       /* allocate string IDs */
        status = usb_string_ids_tab(cdev, strings_dev);
        if (unlikely(status < 0))
                goto fail2;
 
-       device_desc.iManufacturer =
-               strings_dev[MULTI_STRING_MANUFACTURER_IDX].id;
-       device_desc.iProduct      =
-               strings_dev[MULTI_STRING_PRODUCT_IDX].id;
-
        /* register configurations */
        status = rndis_config_register(cdev);
        if (unlikely(status < 0))
@@ -370,6 +355,8 @@ static struct usb_composite_driver multi_driver = {
        .strings        = dev_strings,
        .bind           = multi_bind,
        .unbind         = __exit_p(multi_unbind),
+       .iProduct       = DRIVER_DESC,
+       .needs_serial   = 1,
 };