usb: gadget: f_obex: convert to new function interface with backward compatibility

[deliverable/linux.git] / drivers / usb / gadget / serial.c

diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 68d7bb06ebcb83245658bbe6473892a529eb05b2..664da64932399f5125cc20f26c834894305fa01c 100644 (file)
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -36,8 +36,8 @@
  * the runtime footprint, and giving us at least some parts of what
  * a "gcc --combine ... part1.c part2.c part3.c ... " build would.
  */
+#define USBF_OBEX_INCLUDED
 #include "f_obex.c"
-#include "f_serial.c"
 
 /*-------------------------------------------------------------------------*/
 USB_GADGET_COMPOSITE_OPTIONS();
@@ -138,16 +138,6 @@ static int __init serial_bind_obex_config(struct usb_configuration *c)
        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) */
        /* .bConfigurationValue = f(use_acm) */
@@ -169,15 +159,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,12 +199,14 @@ out:
 static int __init gs_bind(struct usb_composite_dev *cdev)
 {
        int                     status;
-       int                     cur_line;
+       int                     cur_line = 0;
 
-       for (cur_line = 0; cur_line < n_ports; cur_line++) {
-               status = gserial_alloc_line(&tty_lines[cur_line]);
-               if (status)
-                       goto fail;
+       if (use_obex) {
+               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
@@ -245,9 +234,10 @@ static int __init gs_bind(struct usb_composite_dev *cdev)
        } 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);
+       else {
+               status = serial_register_ports(cdev, &serial_config_driver,
+                               "gser");
+       }
        if (status < 0)
                goto fail;
 
@@ -258,7 +248,7 @@ static int __init gs_bind(struct usb_composite_dev *cdev)
 
 fail:
        cur_line--;
-       while (cur_line >= 0)
+       while (cur_line >= 0 && use_obex)
                gserial_free_line(tty_lines[cur_line--]);
        return status;
 }
@@ -270,7 +260,8 @@ 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]);
+               if (use_obex)
+                       gserial_free_line(tty_lines[i]);
        }
        return 0;
 }