Merge tag 'usb-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB updates from Greg KH:
 "Here's the big USB 3.11-rc1 merge request.

  Lots of gadget and finally, chipidea driver updates (they were much
  needed), along with a new host controller driver, lots of little
  serial driver fixes, the removal of the 255 usb-serial device
  limitation, and a variety of other minor things.

  All of these have been in the linux-next releases for a while"

* tag 'usb-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (254 commits)
  usb: musb: omap2430: make it compile again
  usb: chipidea: ci_hdrc_imx: access phy via private data
  xhci: Add missing unlocks on error paths
  USB: option,qcserial: move Novatel Gobi1K IDs to qcserial
  ehci-atmel.c: prepare clk before calling enable
  USB: ohci-at91: prepare clk before calling enable
  USB: HWA: fix device probe failure
  wusbcore: add entries in Documentation/ABI for new wusbhc sysfs attributes
  wusbcore: add sysfs attribute for retry count
  wusbcore: add sysfs attribute for DNTS count and interval
  usb: chipidea: drop "13xxx" infix
  usb: phy: tegra: remove duplicated include from phy-tegra-usb.c
  usb: host: xhci-plat: release mem region while removing module
  usbmisc_imx: allow autoloading on according to dt ids
  usb: fix build error without CONFIG_USB_PHY
  usb: check usb_hub_to_struct_hub() return value
  xhci: check for failed dma pool allocation
  usb: gadget: f_subset: fix missing unlock on error in geth_alloc()
  usb: gadget: f_ncm: fix missing unlock on error in ncm_alloc()
  usb: gadget: f_ecm: fix missing unlock on error in ecm_alloc()
  ...

1 files changed, 8 insertions, 67 deletions

diff --git a/drivers/usb/gadget/f_obex.c b/drivers/usb/gadget/f_obex.c
index 8aa2be5329bc..ad39f1dacba3 100644
--- 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 */
 
@@ -406,57 +403,6 @@ fail:
         return status;
 }
 
-#ifdef USBF_OBEX_INCLUDED
-
-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));
-}
-
-/**
- * obex_bind_config - add a CDC OBEX function to a configuration
- * @c: the configuration to support the CDC OBEX instance
- * @port_num: /dev/ttyGS* port this interface will use
- * Context: single threaded during gadget setup
- *
- * Returns zero on success, else negative errno.
- */
-int __init obex_bind_config(struct usb_configuration *c, u8 port_num)
-{
-        struct f_obex   *obex;
-        int             status;
-
-        /* allocate and initialize one new instance */
-        obex = kzalloc(sizeof *obex, GFP_KERNEL);
-        if (!obex)
-                return -ENOMEM;
-
-        obex->port_num = port_num;
-
-        obex->port.connect = obex_connect;
-        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;
-        obex->port.func.set_alt = obex_set_alt;
-        obex->port.func.get_alt = obex_get_alt;
-        obex->port.func.disable = obex_disable;
-
-        status = usb_add_function(c, &obex->port.func);
-        if (status)
-                kfree(obex);
-
-        return status;
-}
-
-#else
-
 static inline struct f_serial_opts *to_f_serial_opts(struct config_item *item)
 {
         return container_of(to_config_group(item), struct f_serial_opts,
@@ -550,7 +496,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 +517,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;
@@ -585,8 +529,5 @@ struct usb_function *obex_alloc(struct usb_function_instance *fi)
 }
 
 DECLARE_USB_FUNCTION_INIT(obex, obex_alloc_inst, obex_alloc);
-
-#endif
-
 MODULE_AUTHOR("Felipe Balbi");
 MODULE_LICENSE("GPL");