1 files changed, 20 insertions, 43 deletions

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 3a7668bde3ef..5d027b3e1ef0 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -228,10 +228,6 @@
 
 static const char fsg_string_interface[] = "Mass Storage";
 
-#define FSG_NO_DEVICE_STRINGS    1
-#define FSG_NO_OTG               1
-#define FSG_NO_INTR_EP           1
-
 #include "storage_common.c"
 
 
@@ -2904,9 +2900,7 @@ static void fsg_unbind(struct usb_configuration *c, struct usb_function *f)
         }
 
         fsg_common_put(common);
-        usb_free_descriptors(fsg->function.descriptors);
-        usb_free_descriptors(fsg->function.hs_descriptors);
-        usb_free_descriptors(fsg->function.ss_descriptors);
+        usb_free_all_descriptors(&fsg->function);
         kfree(fsg);
 }
 
@@ -2916,6 +2910,8 @@ static int fsg_bind(struct usb_configuration *c, struct usb_function *f)
         struct usb_gadget       *gadget = c->cdev->gadget;
         int                     i;
         struct usb_ep           *ep;
+        unsigned                max_burst;
+        int                     ret;
 
         fsg->gadget = gadget;
 
@@ -2939,45 +2935,27 @@ static int fsg_bind(struct usb_configuration *c, struct usb_function *f)
         ep->driver_data = fsg->common;  /* claim the endpoint */
         fsg->bulk_out = ep;
 
-        /* Copy descriptors */
-        f->descriptors = usb_copy_descriptors(fsg_fs_function);
-        if (unlikely(!f->descriptors))
-                return -ENOMEM;
-
-        if (gadget_is_dualspeed(gadget)) {
-                /* Assume endpoint addresses are the same for both speeds */
-                fsg_hs_bulk_in_desc.bEndpointAddress =
-                        fsg_fs_bulk_in_desc.bEndpointAddress;
-                fsg_hs_bulk_out_desc.bEndpointAddress =
-                        fsg_fs_bulk_out_desc.bEndpointAddress;
-                f->hs_descriptors = usb_copy_descriptors(fsg_hs_function);
-                if (unlikely(!f->hs_descriptors)) {
-                        usb_free_descriptors(f->descriptors);
-                        return -ENOMEM;
-                }
-        }
-
-        if (gadget_is_superspeed(gadget)) {
-                unsigned        max_burst;
+        /* Assume endpoint addresses are the same for both speeds */
+        fsg_hs_bulk_in_desc.bEndpointAddress =
+                fsg_fs_bulk_in_desc.bEndpointAddress;
+        fsg_hs_bulk_out_desc.bEndpointAddress =
+                fsg_fs_bulk_out_desc.bEndpointAddress;
 
-                /* Calculate bMaxBurst, we know packet size is 1024 */
-                max_burst = min_t(unsigned, FSG_BUFLEN / 1024, 15);
+        /* Calculate bMaxBurst, we know packet size is 1024 */
+        max_burst = min_t(unsigned, FSG_BUFLEN / 1024, 15);
 
-                fsg_ss_bulk_in_desc.bEndpointAddress =
-                        fsg_fs_bulk_in_desc.bEndpointAddress;
-                fsg_ss_bulk_in_comp_desc.bMaxBurst = max_burst;
+        fsg_ss_bulk_in_desc.bEndpointAddress =
+                fsg_fs_bulk_in_desc.bEndpointAddress;
+        fsg_ss_bulk_in_comp_desc.bMaxBurst = max_burst;
 
-                fsg_ss_bulk_out_desc.bEndpointAddress =
-                        fsg_fs_bulk_out_desc.bEndpointAddress;
-                fsg_ss_bulk_out_comp_desc.bMaxBurst = max_burst;
+        fsg_ss_bulk_out_desc.bEndpointAddress =
+                fsg_fs_bulk_out_desc.bEndpointAddress;
+        fsg_ss_bulk_out_comp_desc.bMaxBurst = max_burst;
 
-                f->ss_descriptors = usb_copy_descriptors(fsg_ss_function);
-                if (unlikely(!f->ss_descriptors)) {
-                        usb_free_descriptors(f->hs_descriptors);
-                        usb_free_descriptors(f->descriptors);
-                        return -ENOMEM;
-                }
-        }
+        ret = usb_assign_descriptors(f, fsg_fs_function, fsg_hs_function,
+                        fsg_ss_function);
+        if (ret)
+                goto autoconf_fail;
 
         return 0;
 
@@ -2986,7 +2964,6 @@ autoconf_fail:
         return -ENOTSUPP;
 }
 
-
 /****************************** ADD FUNCTION ******************************/
 
 static struct usb_gadget_strings *fsg_strings_array[] = {