Since the last patch composite_manufacturer is unused because all
gadgets provide a iManufacturer property so remove it.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
---
drivers/usb/gadget/composite.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 9c09cf6..2ce92c9 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -37,8 +37,6 @@ static char *iProduct;
module_param(iProduct, charp, S_IRUGO);
MODULE_PARM_DESC(iProduct, "USB Product string");
-static char composite_manufacturer[50];
-
/*-------------------------------------------------------------------------*/
/**
* next_ep_desc() - advance to the next EP descriptor
@@ -913,7 +911,7 @@ static int get_string(struct usb_composite_dev *cdev,
* check if the string has not been overridden.
*/
if (cdev->manufacturer_override == id)
- str = cdriver->iManufacturer ?: composite_manufacturer;
+ str = cdriver->iManufacturer;
else if (cdev->product_override == id)
str = iProduct ?: cdriver->iProduct;
else if (cdev->serial_override == id)
@@ -1456,18 +1454,9 @@ static int composite_bind(struct usb_gadget *gadget,
cdev->desc = *cdriver->dev;
/* string overrides */
- if (!cdev->desc.iManufacturer) {
- if (!cdriver->iManufacturer)
- snprintf(composite_manufacturer,
- sizeof composite_manufacturer,
- "%s %s with %s",
- init_utsname()->sysname,
- init_utsname()->release,
- gadget->name);
-
+ if (!cdev->desc.iManufacturer && cdriver->iManufacturer)
cdev->manufacturer_override =
override_id(cdev, &cdev->desc.iManufacturer);
- }
if (iProduct || (!cdev->desc.iProduct && cdriver->iProduct))
cdev->product_override =
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
