USB: serial: remove usb_serial_disconnect call in all drivers

[linux-beck.git] / drivers / usb / serial / ssu100.c

diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c
index 7697858d8858abefb181e9f139a17c17b6240890..f72b03f83be2bd505a0a6e3c6a0fcc8bd47d4ee7 100644 (file)
--- a/drivers/usb/serial/ssu100.c
+++ b/drivers/usb/serial/ssu100.c
@@ -65,13 +65,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
 
 static struct usb_driver ssu100_driver = {
        .name                          = "ssu100",
-       .probe                         = usb_serial_probe,
-       .disconnect                    = usb_serial_disconnect,
        .id_table                      = id_table,
-       .suspend                       = usb_serial_suspend,
-       .resume                        = usb_serial_resume,
-       .no_dynamic_id                 = 1,
-       .supports_autosuspend          = 1,
 };
 
 struct ssu100_port_private {
@@ -86,7 +80,6 @@ static void ssu100_release(struct usb_serial *serial)
 {
        struct ssu100_port_private *priv = usb_get_serial_port_data(*serial->port);
 
-       dbg("%s", __func__);
        kfree(priv);
 }
 
@@ -172,8 +165,6 @@ static int ssu100_initdevice(struct usb_device *dev)
        u8 *data;
        int result = 0;
 
-       dbg("%s", __func__);
-
        data = kzalloc(3, GFP_KERNEL);
        if (!data)
                return -ENOMEM;
@@ -238,8 +229,6 @@ static void ssu100_set_termios(struct tty_struct *tty,
        u16 urb_value = 0; /* will hold the new flags */
        int result;
 
-       dbg("%s", __func__);
-
        if (cflag & PARENB) {
                if (cflag & PARODD)
                        urb_value |= UART_LCR_PARITY;
@@ -313,8 +302,6 @@ static int ssu100_open(struct tty_struct *tty, struct usb_serial_port *port)
        int result;
        unsigned long flags;
 
-       dbg("%s - port %d", __func__, port->number);
-
        data = kzalloc(2, GFP_KERNEL);
        if (!data)
                return -ENOMEM;
@@ -349,7 +336,6 @@ static int ssu100_open(struct tty_struct *tty, struct usb_serial_port *port)
 
 static void ssu100_close(struct usb_serial_port *port)
 {
-       dbg("%s", __func__);
        usb_serial_generic_close(port);
 }
 
@@ -468,8 +454,6 @@ static int ssu100_attach(struct usb_serial *serial)
        struct ssu100_port_private *priv;
        struct usb_serial_port *port = *serial->port;
 
-       dbg("%s", __func__);
-
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
        if (!priv) {
                dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__,
@@ -491,8 +475,6 @@ static int ssu100_tiocmget(struct tty_struct *tty)
        u8 *d;
        int r;
 
-       dbg("%s\n", __func__);
-
        d = kzalloc(2, GFP_KERNEL);
        if (!d)
                return -ENOMEM;
@@ -523,7 +505,6 @@ static int ssu100_tiocmset(struct tty_struct *tty,
        struct usb_serial_port *port = tty->driver_data;
        struct usb_device *dev = port->serial->dev;
 
-       dbg("%s\n", __func__);
        return update_mctrl(dev, set, clear);
 }
 
@@ -531,8 +512,6 @@ static void ssu100_dtr_rts(struct usb_serial_port *port, int on)
 {
        struct usb_device *dev = port->serial->dev;
 
-       dbg("%s\n", __func__);
-
        mutex_lock(&port->serial->disc_mutex);
        if (!port->serial->disconnected) {
                /* Disable flow control */
@@ -619,8 +598,6 @@ static int ssu100_process_packet(struct urb *urb,
        int i;
        char *ch;
 
-       dbg("%s - port %d", __func__, port->number);
-
        if ((len >= 4) &&
            (packet[0] == 0x1b) && (packet[1] == 0x1b) &&
            ((packet[2] == 0x00) || (packet[2] == 0x01))) {
@@ -657,8 +634,6 @@ static void ssu100_process_read_urb(struct urb *urb)
        struct tty_struct *tty;
        int count;
 
-       dbg("%s", __func__);
-
        tty = tty_port_tty_get(&port->port);
        if (!tty)
                return;
@@ -677,7 +652,6 @@ static struct usb_serial_driver ssu100_device = {
        },
        .description         = DRIVER_DESC,
        .id_table            = id_table,
-       .usb_driver          = &ssu100_driver,
        .num_ports           = 1,
        .open                = ssu100_open,
        .close               = ssu100_close,
@@ -693,41 +667,11 @@ static struct usb_serial_driver ssu100_device = {
        .disconnect          = usb_serial_generic_disconnect,
 };
 
-static int __init ssu100_init(void)
-{
-       int retval;
-
-       dbg("%s", __func__);
-
-       /* register with usb-serial */
-       retval = usb_serial_register(&ssu100_device);
-
-       if (retval)
-               goto failed_usb_sio_register;
-
-       retval = usb_register(&ssu100_driver);
-       if (retval)
-               goto failed_usb_register;
-
-       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-              DRIVER_DESC "\n");
-
-       return 0;
-
-failed_usb_register:
-       usb_serial_deregister(&ssu100_device);
-failed_usb_sio_register:
-       return retval;
-}
-
-static void __exit ssu100_exit(void)
-{
-       usb_deregister(&ssu100_driver);
-       usb_serial_deregister(&ssu100_device);
-}
+static struct usb_serial_driver * const serial_drivers[] = {
+       &ssu100_device, NULL
+};
 
-module_init(ssu100_init);
-module_exit(ssu100_exit);
+module_usb_serial_driver(ssu100_driver, serial_drivers);
 
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");