usb: gadget: use usb_string_ids_tab instead multiple usb_string_id()

[deliverable/linux.git] / drivers / usb / gadget / gmidi.c

diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 0c70708ef80f807d21581b4fa346cfec323a0873..68f8c032ba6b253fd5a569ab7271c4c48e4800b7 100644 (file)
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -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) {