1 files changed, 7 insertions, 52 deletions

diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 68d7bb06ebcb..1f5f978d35d5 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -12,6 +12,7 @@
 
 #include <linux/kernel.h>
 #include <linux/device.h>
+#include <linux/module.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 
@@ -28,18 +29,6 @@
 #define GS_VERSION_NAME                 GS_LONG_NAME " " GS_VERSION_STR
 
 /*-------------------------------------------------------------------------*/
-
-/*
- * Kbuild is not very cooperative with respect to linking separately
- * compiled library objects into one module.  So for now we won't use
- * separate compilation ... ensuring init/exit sections work to shrink
- * the runtime footprint, and giving us at least some parts of what
- * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
- */
-#include "f_obex.c"
-#include "f_serial.c"
-
-/*-------------------------------------------------------------------------*/
 USB_GADGET_COMPOSITE_OPTIONS();
 
 /* Thanks to NetChip Technologies for donating this product ID.
@@ -126,27 +115,6 @@ module_param(n_ports, uint, 0);
 MODULE_PARM_DESC(n_ports, "number of ports to create, default=1");
 
 /*-------------------------------------------------------------------------*/
-static unsigned char tty_lines[MAX_U_SERIAL_PORTS];
-
-static int __init serial_bind_obex_config(struct usb_configuration *c)
-{
-        unsigned i;
-        int status = 0;
-
-        for (i = 0; i < n_ports && status == 0; i++)
-                status = obex_bind_config(c, tty_lines[i]);
-        return status;
-}
-
-static int __init serial_bind_gser_config(struct usb_configuration *c)
-{
-        unsigned i;
-        int status = 0;
-
-        for (i = 0; i < n_ports && status == 0; i++)
-                status = gser_bind_config(c, tty_lines[i]);
-        return status;
-}
 
 static struct usb_configuration serial_config_driver = {
         /* .label = f(use_acm) */
@@ -169,15 +137,12 @@ static int serial_register_ports(struct usb_composite_dev *cdev,
                 goto out;
 
         for (i = 0; i < n_ports; i++) {
-                struct f_serial_opts *opts;
 
                 fi_serial[i] = usb_get_function_instance(f_name);
                 if (IS_ERR(fi_serial[i])) {
                         ret = PTR_ERR(fi_serial[i]);
                         goto fail;
                 }
-                opts = container_of(fi_serial[i], struct f_serial_opts, func_inst);
-                opts->port_num = tty_lines[i];
 
                 f_serial[i] = usb_get_function(fi_serial[i]);
                 if (IS_ERR(f_serial[i])) {
@@ -212,13 +177,6 @@ out:
 static int __init gs_bind(struct usb_composite_dev *cdev)
 {
         int                     status;
-        int                     cur_line;
-
-        for (cur_line = 0; cur_line < n_ports; cur_line++) {
-                status = gserial_alloc_line(&tty_lines[cur_line]);
-                if (status)
-                        goto fail;
-        }
 
         /* Allocate string descriptor numbers ... note that string
          * contents can be overridden by the composite_dev glue.
@@ -243,11 +201,12 @@ static int __init gs_bind(struct usb_composite_dev *cdev)
                                 "acm");
                 usb_ep_autoconfig_reset(cdev->gadget);
         } else if (use_obex)
-                status = usb_add_config(cdev, &serial_config_driver,
-                                serial_bind_obex_config);
-        else
-                status = usb_add_config(cdev, &serial_config_driver,
-                                serial_bind_gser_config);
+                status = serial_register_ports(cdev, &serial_config_driver,
+                                "obex");
+        else {
+                status = serial_register_ports(cdev, &serial_config_driver,
+                                "gser");
+        }
         if (status < 0)
                 goto fail;
 
@@ -257,9 +216,6 @@ static int __init gs_bind(struct usb_composite_dev *cdev)
         return 0;
 
 fail:
-        cur_line--;
-        while (cur_line >= 0)
-                gserial_free_line(tty_lines[cur_line--]);
         return status;
 }
 
@@ -270,7 +226,6 @@ static int gs_unbind(struct usb_composite_dev *cdev)
         for (i = 0; i < n_ports; i++) {
                 usb_put_function(f_serial[i]);
                 usb_put_function_instance(fi_serial[i]);
-                gserial_free_line(tty_lines[i]);
         }
         return 0;
 }