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

Pull USB patches from Greg Kroah-Hartman:
 "Here's the big set of USB patches for 3.8-rc1.

  Lots of USB host driver cleanups in here, and a bit of a reorg of the
  EHCI driver to make it easier for the different EHCI platform drivers
  to all work together nicer, which was a reduction in overall code.  We
  also deleted some unused firmware files, and got rid of the very old
  file_storage usb gadget driver that had been broken for a long time.
  This means we ended up removing way more code than added, always a
  nice thing to see:
	 310 files changed, 3028 insertions(+), 10754 deletions(-)

  Other than that, the usual set of new device ids, driver fixes, gadget
  driver and controller updates and the like.

  All of these have been in the linux-next tree for a number of weeks.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'usb-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (228 commits)
  USB: mark uas driver as BROKEN
  xhci: Add Lynx Point LP to list of Intel switchable hosts
  uwb: fix uwb_dev_unlock() missed at an error path in uwb_rc_cmd_async()
  USB: ftdi_sio: Add support for Newport AGILIS motor drivers
  MAINTAINERS: remove drivers/block/ub.c
  USB: chipidea: fix use after free bug
  ezusb: add dependency to USB
  usb: ftdi_sio: fixup BeagleBone A5+ quirk
  USB: cp210x: add Virtenio Preon32 device id
  usb: storage: remove redundant memset() in usb_probe_stor1()
  USB: option: blacklist network interface on Huawei E173
  USB: OHCI: workaround for hardware bug: retired TDs not added to the Done Queue
  USB: add new zte 3g-dongle's pid to option.c
  USB: opticon: switch to generic read implementation
  USB: opticon: refactor reab-urb processing
  USB: opticon: use usb-serial bulk-in urb
  USB: opticon: increase bulk-in size
  USB: opticon: use port as urb context
  USB: opticon: pass port to get_serial_info
  USB: opticon: make private data port specific
  ...

1 files changed, 31 insertions, 63 deletions

diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index b651b529c67f..6c8362f937be 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -102,7 +102,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
                                  USB_CDC_NCM_NTB32_SUPPORTED)
 
 static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
-        .wLength = sizeof ntb_parameters,
+        .wLength = cpu_to_le16(sizeof(ntb_parameters)),
         .bmNtbFormatsSupported = cpu_to_le16(FORMATS_SUPPORTED),
         .dwNtbInMaxSize = cpu_to_le32(NTB_DEFAULT_IN_SIZE),
         .wNdpInDivisor = cpu_to_le16(4),
@@ -121,7 +121,7 @@ static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
  * waste less bandwidth.
  */
 
-#define LOG2_STATUS_INTERVAL_MSEC       5       /* 1 << 5 == 32 msec */
+#define NCM_STATUS_INTERVAL_MS          32
 #define NCM_STATUS_BYTECOUNT            16      /* 8 byte header + data */
 
 static struct usb_interface_assoc_descriptor ncm_iad_desc __initdata = {
@@ -230,7 +230,7 @@ static struct usb_endpoint_descriptor fs_ncm_notify_desc __initdata = {
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
         .wMaxPacketSize =       cpu_to_le16(NCM_STATUS_BYTECOUNT),
-        .bInterval =            1 << LOG2_STATUS_INTERVAL_MSEC,
+        .bInterval =            NCM_STATUS_INTERVAL_MS,
 };
 
 static struct usb_endpoint_descriptor fs_ncm_in_desc __initdata = {
@@ -275,7 +275,7 @@ static struct usb_endpoint_descriptor hs_ncm_notify_desc __initdata = {
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
         .wMaxPacketSize =       cpu_to_le16(NCM_STATUS_BYTECOUNT),
-        .bInterval =            LOG2_STATUS_INTERVAL_MSEC + 4,
+        .bInterval =            USB_MS_TO_HS_INTERVAL(NCM_STATUS_INTERVAL_MS),
 };
 static struct usb_endpoint_descriptor hs_ncm_in_desc __initdata = {
         .bLength =              USB_DT_ENDPOINT_SIZE,
@@ -321,7 +321,7 @@ static struct usb_descriptor_header *ncm_hs_function[] __initdata = {
 
 static struct usb_string ncm_string_defs[] = {
         [STRING_CTRL_IDX].s = "CDC Network Control Model (NCM)",
-        [STRING_MAC_IDX].s = NULL /* DYNAMIC */,
+        [STRING_MAC_IDX].s = "",
         [STRING_DATA_IDX].s = "CDC Network Data",
         [STRING_IAD_IDX].s = "CDC NCM",
         {  } /* end of list */
@@ -869,15 +869,19 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
         struct sk_buff  *skb2;
         int             ncb_len = 0;
         __le16          *tmp;
-        int             div = ntb_parameters.wNdpInDivisor;
-        int             rem = ntb_parameters.wNdpInPayloadRemainder;
+        int             div;
+        int             rem;
         int             pad;
-        int             ndp_align = ntb_parameters.wNdpInAlignment;
+        int             ndp_align;
         int             ndp_pad;
         unsigned        max_size = ncm->port.fixed_in_len;
         struct ndp_parser_opts *opts = ncm->parser_opts;
         unsigned        crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
 
+        div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
+        rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
+        ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
+
         ncb_len += opts->nth_size;
         ndp_pad = ALIGN(ncb_len, ndp_align) - ncb_len;
         ncb_len += ndp_pad;
@@ -1208,30 +1212,18 @@ ncm_bind(struct usb_configuration *c, struct usb_function *f)
         ncm->notify_req->context = ncm;
         ncm->notify_req->complete = ncm_notify_complete;
 
-        /* copy descriptors, and track endpoint copies */
-        f->descriptors = usb_copy_descriptors(ncm_fs_function);
-        if (!f->descriptors)
-                goto fail;
-
         /*
          * support all relevant hardware speeds... we expect that when
          * hardware is dual speed, all bulk-capable endpoints work at
          * both speeds
          */
-        if (gadget_is_dualspeed(c->cdev->gadget)) {
-                hs_ncm_in_desc.bEndpointAddress =
-                                fs_ncm_in_desc.bEndpointAddress;
-                hs_ncm_out_desc.bEndpointAddress =
-                                fs_ncm_out_desc.bEndpointAddress;
-                hs_ncm_notify_desc.bEndpointAddress =
-                                fs_ncm_notify_desc.bEndpointAddress;
-
-                /* copy descriptors, and track endpoint copies */
-                f->hs_descriptors = usb_copy_descriptors(ncm_hs_function);
-                if (!f->hs_descriptors)
-                        goto fail;
-        }
+        hs_ncm_in_desc.bEndpointAddress = fs_ncm_in_desc.bEndpointAddress;
+        hs_ncm_out_desc.bEndpointAddress = fs_ncm_out_desc.bEndpointAddress;
+        hs_ncm_notify_desc.bEndpointAddress =
+                fs_ncm_notify_desc.bEndpointAddress;
 
+        status = usb_assign_descriptors(f, ncm_fs_function, ncm_hs_function,
+                        NULL);
         /*
          * NOTE:  all that is done without knowing or caring about
          * the network link ... which is unavailable to this code
@@ -1248,9 +1240,7 @@ ncm_bind(struct usb_configuration *c, struct usb_function *f)
         return 0;
 
 fail:
-        if (f->descriptors)
-                usb_free_descriptors(f->descriptors);
-
+        usb_free_all_descriptors(f);
         if (ncm->notify_req) {
                 kfree(ncm->notify_req->buf);
                 usb_ep_free_request(ncm->notify, ncm->notify_req);
@@ -1259,9 +1249,9 @@ fail:
         /* we might as well release our claims on endpoints */
         if (ncm->notify)
                 ncm->notify->driver_data = NULL;
-        if (ncm->port.out_ep->desc)
+        if (ncm->port.out_ep)
                 ncm->port.out_ep->driver_data = NULL;
-        if (ncm->port.in_ep->desc)
+        if (ncm->port.in_ep)
                 ncm->port.in_ep->driver_data = NULL;
 
         ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
@@ -1276,14 +1266,12 @@ ncm_unbind(struct usb_configuration *c, struct usb_function *f)
 
         DBG(c->cdev, "ncm unbind\n");
 
-        if (gadget_is_dualspeed(c->cdev->gadget))
-                usb_free_descriptors(f->hs_descriptors);
-        usb_free_descriptors(f->descriptors);
+        ncm_string_defs[0].id = 0;
+        usb_free_all_descriptors(f);
 
         kfree(ncm->notify_req->buf);
         usb_ep_free_request(ncm->notify, ncm->notify_req);
 
-        ncm_string_defs[1].s = NULL;
         kfree(ncm);
 }
 
@@ -1307,37 +1295,19 @@ int __init ncm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
         if (!can_support_ecm(c->cdev->gadget) || !ethaddr)
                 return -EINVAL;
 
-        /* maybe allocate device-global string IDs */
         if (ncm_string_defs[0].id == 0) {
-
-                /* control interface label */
-                status = usb_string_id(c->cdev);
+                status = usb_string_ids_tab(c->cdev, ncm_string_defs);
                 if (status < 0)
                         return status;
-                ncm_string_defs[STRING_CTRL_IDX].id = status;
-                ncm_control_intf.iInterface = status;
+                ncm_control_intf.iInterface =
+                        ncm_string_defs[STRING_CTRL_IDX].id;
 
-                /* data interface label */
-                status = usb_string_id(c->cdev);
-                if (status < 0)
-                        return status;
-                ncm_string_defs[STRING_DATA_IDX].id = status;
+                status = ncm_string_defs[STRING_DATA_IDX].id;
                 ncm_data_nop_intf.iInterface = status;
                 ncm_data_intf.iInterface = status;
 
-                /* MAC address */
-                status = usb_string_id(c->cdev);
-                if (status < 0)
-                        return status;
-                ncm_string_defs[STRING_MAC_IDX].id = status;
-                ecm_desc.iMACAddress = status;
-
-                /* IAD */
-                status = usb_string_id(c->cdev);
-                if (status < 0)
-                        return status;
-                ncm_string_defs[STRING_IAD_IDX].id = status;
-                ncm_iad_desc.iFunction = status;
+                ecm_desc.iMACAddress = ncm_string_defs[STRING_MAC_IDX].id;
+                ncm_iad_desc.iFunction = ncm_string_defs[STRING_IAD_IDX].id;
         }
 
         /* allocate and initialize one new instance */
@@ -1347,7 +1317,7 @@ int __init ncm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
 
         /* export host's Ethernet address in CDC format */
         snprintf(ncm->ethaddr, sizeof ncm->ethaddr, "%pm", ethaddr);
-        ncm_string_defs[1].s = ncm->ethaddr;
+        ncm_string_defs[STRING_MAC_IDX].s = ncm->ethaddr;
 
         spin_lock_init(&ncm->lock);
         ncm_reset_values(ncm);
@@ -1367,9 +1337,7 @@ int __init ncm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN])
         ncm->port.unwrap = ncm_unwrap_ntb;
 
         status = usb_add_function(c, &ncm->port.func);
-        if (status) {
-                ncm_string_defs[1].s = NULL;
+        if (status)
                 kfree(ncm);
-        }
         return status;
 }