usb: gadget: f_obex: use usb_gstrings_attach

use the new usb_gstrings_attach interface

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/f_obex.c b/drivers/usb/gadget/f_obex.c
index 8aa2be5329bcff2a3619c4aa0044c944afa5566f..8d6073aef84e1e8f9c9317ba2fd24d0280043922 100644 (file)
--- a/drivers/usb/gadget/f_obex.c
+++ b/drivers/usb/gadget/f_obex.c
@@ -309,23 +309,20 @@ static int obex_bind(struct usb_configuration *c, struct usb_function *f)
 {
        struct usb_composite_dev *cdev = c->cdev;
        struct f_obex           *obex = func_to_obex(f);
+       struct usb_string       *us;
        int                     status;
        struct usb_ep           *ep;
 
        if (!can_support_obex(c))
                return -EINVAL;
 
-       if (obex_string_defs[OBEX_CTRL_IDX].id == 0) {
-               status = usb_string_ids_tab(c->cdev, obex_string_defs);
-               if (status < 0)
-                       return status;
-               obex_control_intf.iInterface =
-                       obex_string_defs[OBEX_CTRL_IDX].id;
-
-               status = obex_string_defs[OBEX_DATA_IDX].id;
-               obex_data_nop_intf.iInterface = status;
-               obex_data_intf.iInterface = status;
-       }
+       us = usb_gstrings_attach(cdev, obex_strings,
+                                ARRAY_SIZE(obex_string_defs));
+       if (IS_ERR(us))
+               return PTR_ERR(us);
+       obex_control_intf.iInterface = us[OBEX_CTRL_IDX].id;
+       obex_data_nop_intf.iInterface = us[OBEX_DATA_IDX].id;
+       obex_data_intf.iInterface = us[OBEX_DATA_IDX].id;
 
        /* allocate instance-specific interface IDs, and patch descriptors */
 
@@ -411,7 +408,6 @@ fail:
 static void
 obex_old_unbind(struct usb_configuration *c, struct usb_function *f)
 {
-       obex_string_defs[OBEX_CTRL_IDX].id = 0;
        usb_free_all_descriptors(f);
        kfree(func_to_obex(f));
 }
@@ -440,7 +436,6 @@ int __init obex_bind_config(struct usb_configuration *c, u8 port_num)
        obex->port.disconnect = obex_disconnect;
 
        obex->port.func.name = "obex";
-       obex->port.func.strings = obex_strings;
        /* descriptors are per-instance copies */
        obex->port.func.bind = obex_bind;
        obex->port.func.unbind = obex_old_unbind;
@@ -550,7 +545,6 @@ static void obex_free(struct usb_function *f)
 
 static void obex_unbind(struct usb_configuration *c, struct usb_function *f)
 {
-       obex_string_defs[OBEX_CTRL_IDX].id = 0;
        usb_free_all_descriptors(f);
 }
 
@@ -572,7 +566,6 @@ struct usb_function *obex_alloc(struct usb_function_instance *fi)
        obex->port.disconnect = obex_disconnect;
 
        obex->port.func.name = "obex";
-       obex->port.func.strings = obex_strings;
        /* descriptors are per-instance copies */
        obex->port.func.bind = obex_bind;
        obex->port.func.unbind = obex_unbind;