Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 325915
b: refs/heads/master
c: e1f15cc
h: refs/heads/master
i:
  325913: b6f01e8
  325911: 181cf50
v: v3
  • Loading branch information
Sebastian Andrzej Siewior authored and Felipe Balbi committed Sep 10, 2012
1 parent ebf3cd7 commit d821be7
Show file tree
Hide file tree
Showing 12 changed files with 47 additions and 138 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 72258493ec4f77a772d05a8df5ee663e1e24154b
refs/heads/master: e1f15ccbae40b55a4e2591373ea5f1808cf29855
12 changes: 3 additions & 9 deletions trunk/drivers/usb/gadget/acm_ms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 3 additions & 9 deletions trunk/drivers/usb/gadget/audio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 3 additions & 9 deletions trunk/drivers/usb/gadget/cdc2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 3 additions & 9 deletions trunk/drivers/usb/gadget/ether.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
21 changes: 4 additions & 17 deletions trunk/drivers/usb/gadget/gmidi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
11 changes: 3 additions & 8 deletions trunk/drivers/usb/gadget/hid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,12 @@ static int __init hid_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);
if (status < 0)
return status;
strings_dev[STRING_MANUFACTURER_IDX].id = status;
device_desc.iManufacturer = status;

status = usb_string_id(cdev);
status = usb_string_ids_tab(cdev, strings_dev);
if (status < 0)
return status;
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, &config_driver, do_config);
Expand Down
12 changes: 3 additions & 9 deletions trunk/drivers/usb/gadget/ncm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,11 @@ static int __init gncm_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;

status = usb_add_config(cdev, &ncm_config_driver,
ncm_do_config);
Expand Down
22 changes: 4 additions & 18 deletions trunk/drivers/usb/gadget/nokia.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,26 +164,12 @@ static int __init nokia_bind(struct usb_composite_dev *cdev)
if (status < 0)
goto err_ether;

status = usb_string_id(cdev);
status = usb_string_ids_tab(cdev, strings_dev);
if (status < 0)
goto err_usb;
strings_dev[STRING_MANUFACTURER_IDX].id = status;

device_desc.iManufacturer = status;

status = usb_string_id(cdev);
if (status < 0)
goto err_usb;
strings_dev[STRING_PRODUCT_IDX].id = status;

device_desc.iProduct = status;

/* config description */
status = usb_string_id(cdev);
if (status < 0)
goto err_usb;
strings_dev[STRING_DESCRIPTION_IDX].id = status;

device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;
device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;
status = strings_dev[STRING_DESCRIPTION_IDX].id;
nokia_config_500ma_driver.iConfiguration = status;
nokia_config_100ma_driver.iConfiguration = status;

Expand Down
22 changes: 4 additions & 18 deletions trunk/drivers/usb/gadget/serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,26 +175,12 @@ static int __init gs_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;

/* config description */
status = usb_string_id(cdev);
if (status < 0)
goto fail;
strings_dev[STRING_DESCRIPTION_IDX].id = status;

device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;
device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;
status = strings_dev[STRING_DESCRIPTION_IDX].id;
serial_config_driver.iConfiguration = status;

/* set up other descriptors */
Expand Down
21 changes: 8 additions & 13 deletions trunk/drivers/usb/gadget/webcam.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,20 +355,15 @@ webcam_bind(struct usb_composite_dev *cdev)
/* Allocate string descriptor numbers ... note that string contents
* can be overridden by the composite_dev glue.
*/
if ((ret = usb_string_id(cdev)) < 0)
ret = usb_string_ids_tab(cdev, webcam_strings);
if (ret < 0)
goto error;
webcam_strings[STRING_MANUFACTURER_IDX].id = ret;
webcam_device_descriptor.iManufacturer = ret;

if ((ret = usb_string_id(cdev)) < 0)
goto error;
webcam_strings[STRING_PRODUCT_IDX].id = ret;
webcam_device_descriptor.iProduct = ret;

if ((ret = usb_string_id(cdev)) < 0)
goto error;
webcam_strings[STRING_DESCRIPTION_IDX].id = ret;
webcam_config_driver.iConfiguration = ret;
webcam_device_descriptor.iManufacturer =
webcam_strings[STRING_MANUFACTURER_IDX].id;
webcam_device_descriptor.iProduct =
webcam_strings[STRING_PRODUCT_IDX].id;
webcam_config_driver.iConfiguration =
webcam_strings[STRING_DESCRIPTION_IDX].id;

/* Register our configuration. */
if ((ret = usb_add_config(cdev, &webcam_config_driver,
Expand Down
26 changes: 8 additions & 18 deletions trunk/drivers/usb/gadget/zero.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,28 +264,18 @@ static int __init zero_bind(struct usb_composite_dev *cdev)
{
int gcnum;
struct usb_gadget *gadget = cdev->gadget;
int id;
int status;

/* Allocate string descriptor numbers ... note that string
* contents can be overridden by the composite_dev glue.
*/
id = usb_string_id(cdev);
if (id < 0)
return id;
strings_dev[STRING_MANUFACTURER_IDX].id = id;
device_desc.iManufacturer = id;

id = usb_string_id(cdev);
if (id < 0)
return id;
strings_dev[STRING_PRODUCT_IDX].id = id;
device_desc.iProduct = id;

id = usb_string_id(cdev);
if (id < 0)
return id;
strings_dev[STRING_SERIAL_IDX].id = id;
device_desc.iSerialNumber = id;
status = usb_string_ids_tab(cdev, strings_dev);
if (status < 0)
return status;

device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;
device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;
device_desc.iSerialNumber = strings_dev[STRING_SERIAL_IDX].id;

setup_timer(&autoresume_timer, zero_autoresume, (unsigned long) cdev);

Expand Down

0 comments on commit d821be7

Please sign in to comment.