1 files changed, 25 insertions, 69 deletions

diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index b1681e45aca7..71beeb833558 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -101,7 +101,7 @@ static unsigned int bitrate(struct usb_gadget *g)
 /*
  */
 
-#define LOG2_STATUS_INTERVAL_MSEC       5       /* 1 << 5 == 32 msec */
+#define RNDIS_STATUS_INTERVAL_MS        32
 #define STATUS_BYTECOUNT                8       /* 8 bytes data */
 
 
@@ -190,7 +190,7 @@ static struct usb_endpoint_descriptor fs_notify_desc = {
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
         .wMaxPacketSize =       cpu_to_le16(STATUS_BYTECOUNT),
-        .bInterval =            1 << LOG2_STATUS_INTERVAL_MSEC,
+        .bInterval =            RNDIS_STATUS_INTERVAL_MS,
 };
 
 static struct usb_endpoint_descriptor fs_in_desc = {
@@ -236,7 +236,7 @@ static struct usb_endpoint_descriptor hs_notify_desc = {
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
         .wMaxPacketSize =       cpu_to_le16(STATUS_BYTECOUNT),
-        .bInterval =            LOG2_STATUS_INTERVAL_MSEC + 4,
+        .bInterval =            USB_MS_TO_HS_INTERVAL(RNDIS_STATUS_INTERVAL_MS)
 };
 
 static struct usb_endpoint_descriptor hs_in_desc = {
@@ -284,7 +284,7 @@ static struct usb_endpoint_descriptor ss_notify_desc = {
         .bEndpointAddress =     USB_DIR_IN,
         .bmAttributes =         USB_ENDPOINT_XFER_INT,
         .wMaxPacketSize =       cpu_to_le16(STATUS_BYTECOUNT),
-        .bInterval =            LOG2_STATUS_INTERVAL_MSEC + 4,
+        .bInterval =            USB_MS_TO_HS_INTERVAL(RNDIS_STATUS_INTERVAL_MS)
 };
 
 static struct usb_ss_ep_comp_descriptor ss_intr_comp_desc = {
@@ -722,42 +722,22 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
         rndis->notify_req->context = rndis;
         rndis->notify_req->complete = rndis_response_complete;
 
-        /* copy descriptors, and track endpoint copies */
-        f->descriptors = usb_copy_descriptors(eth_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_in_desc.bEndpointAddress =
-                                fs_in_desc.bEndpointAddress;
-                hs_out_desc.bEndpointAddress =
-                                fs_out_desc.bEndpointAddress;
-                hs_notify_desc.bEndpointAddress =
-                                fs_notify_desc.bEndpointAddress;
-
-                /* copy descriptors, and track endpoint copies */
-                f->hs_descriptors = usb_copy_descriptors(eth_hs_function);
-                if (!f->hs_descriptors)
-                        goto fail;
-        }
+        hs_in_desc.bEndpointAddress = fs_in_desc.bEndpointAddress;
+        hs_out_desc.bEndpointAddress = fs_out_desc.bEndpointAddress;
+        hs_notify_desc.bEndpointAddress = fs_notify_desc.bEndpointAddress;
 
-        if (gadget_is_superspeed(c->cdev->gadget)) {
-                ss_in_desc.bEndpointAddress =
-                                fs_in_desc.bEndpointAddress;
-                ss_out_desc.bEndpointAddress =
-                                fs_out_desc.bEndpointAddress;
-                ss_notify_desc.bEndpointAddress =
-                                fs_notify_desc.bEndpointAddress;
-
-                /* copy descriptors, and track endpoint copies */
-                f->ss_descriptors = usb_copy_descriptors(eth_ss_function);
-                if (!f->ss_descriptors)
-                        goto fail;
-        }
+        ss_in_desc.bEndpointAddress = fs_in_desc.bEndpointAddress;
+        ss_out_desc.bEndpointAddress = fs_out_desc.bEndpointAddress;
+        ss_notify_desc.bEndpointAddress = fs_notify_desc.bEndpointAddress;
+
+        status = usb_assign_descriptors(f, eth_fs_function, eth_hs_function,
+                        eth_ss_function);
+        if (status)
+                goto fail;
 
         rndis->port.open = rndis_open;
         rndis->port.close = rndis_close;
@@ -788,12 +768,7 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
         return 0;
 
 fail:
-        if (gadget_is_superspeed(c->cdev->gadget) && f->ss_descriptors)
-                usb_free_descriptors(f->ss_descriptors);
-        if (gadget_is_dualspeed(c->cdev->gadget) && f->hs_descriptors)
-                usb_free_descriptors(f->hs_descriptors);
-        if (f->descriptors)
-                usb_free_descriptors(f->descriptors);
+        usb_free_all_descriptors(f);
 
         if (rndis->notify_req) {
                 kfree(rndis->notify_req->buf);
@@ -803,9 +778,9 @@ fail:
         /* we might as well release our claims on endpoints */
         if (rndis->notify)
                 rndis->notify->driver_data = NULL;
-        if (rndis->port.out_ep->desc)
+        if (rndis->port.out_ep)
                 rndis->port.out_ep->driver_data = NULL;
-        if (rndis->port.in_ep->desc)
+        if (rndis->port.in_ep)
                 rndis->port.in_ep->driver_data = NULL;
 
         ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
@@ -820,13 +795,9 @@ rndis_unbind(struct usb_configuration *c, struct usb_function *f)
 
         rndis_deregister(rndis->config);
         rndis_exit();
-        rndis_string_defs[0].id = 0;
 
-        if (gadget_is_superspeed(c->cdev->gadget))
-                usb_free_descriptors(f->ss_descriptors);
-        if (gadget_is_dualspeed(c->cdev->gadget))
-                usb_free_descriptors(f->hs_descriptors);
-        usb_free_descriptors(f->descriptors);
+        rndis_string_defs[0].id = 0;
+        usb_free_all_descriptors(f);
 
         kfree(rndis->notify_req->buf);
         usb_ep_free_request(rndis->notify, rndis->notify_req);
@@ -851,34 +822,19 @@ rndis_bind_config_vendor(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
         if (!can_support_rndis(c) || !ethaddr)
                 return -EINVAL;
 
-        /* maybe allocate device-global string IDs */
         if (rndis_string_defs[0].id == 0) {
-
                 /* ... and setup RNDIS itself */
                 status = rndis_init();
                 if (status < 0)
                         return status;
 
-                /* control interface label */
-                status = usb_string_id(c->cdev);
-                if (status < 0)
+                status = usb_string_ids_tab(c->cdev, rndis_string_defs);
+                if (status)
                         return status;
-                rndis_string_defs[0].id = status;
-                rndis_control_intf.iInterface = status;
 
-                /* data interface label */
-                status = usb_string_id(c->cdev);
-                if (status < 0)
-                        return status;
-                rndis_string_defs[1].id = status;
-                rndis_data_intf.iInterface = status;
-
-                /* IAD iFunction label */
-                status = usb_string_id(c->cdev);
-                if (status < 0)
-                        return status;
-                rndis_string_defs[2].id = status;
-                rndis_iad_descriptor.iFunction = status;
+                rndis_control_intf.iInterface = rndis_string_defs[0].id;
+                rndis_data_intf.iInterface = rndis_string_defs[1].id;
+                rndis_iad_descriptor.iFunction = rndis_string_defs[2].id;
         }
 
         /* allocate and initialize one new instance */