diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2012-09-06 14:11:16 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-09-10 09:06:48 -0400 |
commit | e1f15ccbae40b55a4e2591373ea5f1808cf29855 (patch) | |
tree | 036c040b04bbd92523f9689f81edf29419dee46f /drivers/usb/gadget/webcam.c | |
parent | 72258493ec4f77a772d05a8df5ee663e1e24154b (diff) |
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: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/webcam.c')
-rw-r--r-- | drivers/usb/gadget/webcam.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/usb/gadget/webcam.c b/drivers/usb/gadget/webcam.c index 66dfca86b215..d44a4510a65a 100644 --- a/drivers/usb/gadget/webcam.c +++ b/drivers/usb/gadget/webcam.c | |||
@@ -355,20 +355,15 @@ webcam_bind(struct usb_composite_dev *cdev) | |||
355 | /* Allocate string descriptor numbers ... note that string contents | 355 | /* Allocate string descriptor numbers ... note that string contents |
356 | * can be overridden by the composite_dev glue. | 356 | * can be overridden by the composite_dev glue. |
357 | */ | 357 | */ |
358 | if ((ret = usb_string_id(cdev)) < 0) | 358 | ret = usb_string_ids_tab(cdev, webcam_strings); |
359 | if (ret < 0) | ||
359 | goto error; | 360 | goto error; |
360 | webcam_strings[STRING_MANUFACTURER_IDX].id = ret; | 361 | webcam_device_descriptor.iManufacturer = |
361 | webcam_device_descriptor.iManufacturer = ret; | 362 | webcam_strings[STRING_MANUFACTURER_IDX].id; |
362 | 363 | webcam_device_descriptor.iProduct = | |
363 | if ((ret = usb_string_id(cdev)) < 0) | 364 | webcam_strings[STRING_PRODUCT_IDX].id; |
364 | goto error; | 365 | webcam_config_driver.iConfiguration = |
365 | webcam_strings[STRING_PRODUCT_IDX].id = ret; | 366 | webcam_strings[STRING_DESCRIPTION_IDX].id; |
366 | webcam_device_descriptor.iProduct = ret; | ||
367 | |||
368 | if ((ret = usb_string_id(cdev)) < 0) | ||
369 | goto error; | ||
370 | webcam_strings[STRING_DESCRIPTION_IDX].id = ret; | ||
371 | webcam_config_driver.iConfiguration = ret; | ||
372 | 367 | ||
373 | /* Register our configuration. */ | 368 | /* Register our configuration. */ |
374 | if ((ret = usb_add_config(cdev, &webcam_config_driver, | 369 | if ((ret = usb_add_config(cdev, &webcam_config_driver, |