Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1f15ccb authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Felipe Balbi
Browse files

usb: gadget: use usb_string_ids_tab instead multiple usb_string_id() 



Using usb_string_ids_tab() instead multiple calls of usb_string_id()
seems to be handy. It also allows to add string without many checks.

Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 72258493

drivers/usb/gadget/acm_ms.c

+3 −9
Original line number Diff line number Diff line
@@ -192,17 +192,11 @@ static int __init acm_ms_bind(struct usb_composite_dev *cdev) 
	snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",

		init_utsname()->sysname, init_utsname()->release,

		gadget->name);

	status = usb_string_id(cdev);

	status = usb_string_ids_tab(cdev, strings_dev);

	if (status < 0)

		goto fail1;

	strings_dev[STRING_MANUFACTURER_IDX].id = status;

	device_desc.iManufacturer = status;



	status = usb_string_id(cdev);

	if (status < 0)

		goto fail1;

	strings_dev[STRING_PRODUCT_IDX].id = status;

	device_desc.iProduct = status;

	device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;



	/* register our configuration */

	status = usb_add_config(cdev, &acm_ms_config_driver, acm_ms_do_config);

drivers/usb/gadget/audio.c

+3 −9
Original line number Diff line number Diff line
@@ -165,17 +165,11 @@ static int __init audio_bind(struct usb_composite_dev *cdev) 
	snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",

		init_utsname()->sysname, init_utsname()->release,

		cdev->gadget->name);

	status = usb_string_id(cdev);

	status = usb_string_ids_tab(cdev, strings_dev);

	if (status < 0)

		goto fail;

	strings_dev[STRING_MANUFACTURER_IDX].id = status;

	device_desc.iManufacturer = status;



	status = usb_string_id(cdev);

	if (status < 0)

		goto fail;

	strings_dev[STRING_PRODUCT_IDX].id = status;

	device_desc.iProduct = status;

	device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;



	status = usb_add_config(cdev, &audio_config_driver, audio_do_config);

	if (status < 0)

drivers/usb/gadget/cdc2.c

+3 −9
Original line number Diff line number Diff line
@@ -193,17 +193,11 @@ static int __init cdc_bind(struct usb_composite_dev *cdev) 
	snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",

		init_utsname()->sysname, init_utsname()->release,

		gadget->name);

	status = usb_string_id(cdev);

	status = usb_string_ids_tab(cdev, strings_dev);

	if (status < 0)

		goto fail1;

	strings_dev[STRING_MANUFACTURER_IDX].id = status;

	device_desc.iManufacturer = status;



	status = usb_string_id(cdev);

	if (status < 0)

		goto fail1;

	strings_dev[STRING_PRODUCT_IDX].id = status;

	device_desc.iProduct = status;

	device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;



	/* register our configuration */

	status = usb_add_config(cdev, &cdc_config_driver, cdc_do_config);

drivers/usb/gadget/ether.c

+3 −9
Original line number Diff line number Diff line
@@ -345,17 +345,11 @@ static int __init eth_bind(struct usb_composite_dev *cdev) 
	snprintf(manufacturer, sizeof manufacturer, "%s %s with %s",

		init_utsname()->sysname, init_utsname()->release,

		gadget->name);

	status = usb_string_id(cdev);

	status = usb_string_ids_tab(cdev, strings_dev);

	if (status < 0)

		goto fail;

	strings_dev[STRING_MANUFACTURER_IDX].id = status;

	device_desc.iManufacturer = status;



	status = usb_string_id(cdev);

	if (status < 0)

		goto fail;

	strings_dev[STRING_PRODUCT_IDX].id = status;

	device_desc.iProduct = status;

	device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;



	/* register our configuration(s); RNDIS first, if it's used */

	if (has_rndis()) {

drivers/usb/gadget/gmidi.c

+4 −17
Original line number Diff line number Diff line
@@ -140,25 +140,12 @@ static int __init midi_bind(struct usb_composite_dev *cdev) 
	struct usb_gadget *gadget = cdev->gadget;

	int gcnum, status;



	status = usb_string_id(cdev);

	status = usb_string_ids_tab(cdev, strings_dev);

	if (status < 0)

		return status;

	strings_dev[STRING_MANUFACTURER_IDX].id = status;

	device_desc.iManufacturer = status;



	status = usb_string_id(cdev);

	if (status < 0)

		return status;

	strings_dev[STRING_PRODUCT_IDX].id = status;

	device_desc.iProduct = status;



	/* config description */

	status = usb_string_id(cdev);

	if (status < 0)

		return status;

	strings_dev[STRING_DESCRIPTION_IDX].id = status;



	midi_config.iConfiguration = status;

	device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;

	device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;

	midi_config.iConfiguration = strings_dev[STRING_DESCRIPTION_IDX].id;



	gcnum = usb_gadget_controller_number(gadget);

	if (gcnum < 0) {