USB: serial: remove usb_serial_disconnect call in all drivers

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

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 664deb63807c0d3ec3d7f6cf359a1cec4ce652de..a2dcf0871811a8ef61e7275e919cb18f4245dc68 100644 (file)
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -52,7 +52,6 @@ static const struct usb_device_id generic_serial_ids[] = {
 static struct usb_driver generic_driver = {
        .name =         "usbserial_generic",
        .probe =        generic_probe,
-       .disconnect =   usb_serial_disconnect,
        .id_table =     generic_serial_ids,
 };
 
@@ -117,8 +116,6 @@ int usb_serial_generic_open(struct tty_struct *tty, struct usb_serial_port *port
        int result = 0;
        unsigned long flags;
 
-       dbg("%s - port %d", __func__, port->number);
-
        /* clear the throttle flags */
        spin_lock_irqsave(&port->lock, flags);
        port->throttled = 0;
@@ -139,12 +136,9 @@ static void generic_cleanup(struct usb_serial_port *port)
        unsigned long flags;
        int i;
 
-       dbg("%s - port %d", __func__, port->number);
-
        if (serial->dev) {
                /* shutdown any bulk transfers that might be going on */
                if (port->bulk_out_size) {
-                       usb_kill_urb(port->write_urb);
                        for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i)
                                usb_kill_urb(port->write_urbs[i]);
 
@@ -161,7 +155,6 @@ static void generic_cleanup(struct usb_serial_port *port)
 
 void usb_serial_generic_close(struct usb_serial_port *port)
 {
-       dbg("%s - port %d", __func__, port->number);
        generic_cleanup(port);
 }
 EXPORT_SYMBOL_GPL(usb_serial_generic_close);
@@ -249,8 +242,6 @@ int usb_serial_generic_write(struct tty_struct *tty,
 {
        int result;
 
-       dbg("%s - port %d", __func__, port->number);
-
        /* only do something if we have a bulk out endpoint */
        if (!port->bulk_out_size)
                return -ENODEV;
@@ -273,8 +264,6 @@ int usb_serial_generic_write_room(struct tty_struct *tty)
        unsigned long flags;
        int room;
 
-       dbg("%s - port %d", __func__, port->number);
-
        if (!port->bulk_out_size)
                return 0;
 
@@ -292,8 +281,6 @@ int usb_serial_generic_chars_in_buffer(struct tty_struct *tty)
        unsigned long flags;
        int chars;
 
-       dbg("%s - port %d", __func__, port->number);
-
        if (!port->bulk_out_size)
                return 0;
 
@@ -313,7 +300,7 @@ static int usb_serial_generic_submit_read_urb(struct usb_serial_port *port,
        if (!test_and_clear_bit(index, &port->read_urbs_free))
                return 0;
 
-       dbg("%s - port %d, urb %d\n", __func__, port->number, index);
+       dbg("%s - port %d, urb %d", __func__, port->number, index);
 
        res = usb_submit_urb(port->read_urbs[index], mem_flags);
        if (res) {
@@ -335,8 +322,6 @@ int usb_serial_generic_submit_read_urbs(struct usb_serial_port *port,
        int res;
        int i;
 
-       dbg("%s - port %d", __func__, port->number);
-
        for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i) {
                res = usb_serial_generic_submit_read_urb(port, i, mem_flags);
                if (res)
@@ -395,10 +380,10 @@ void usb_serial_generic_read_bulk_callback(struct urb *urb)
        }
        set_bit(i, &port->read_urbs_free);
 
-       dbg("%s - port %d, urb %d, len %d\n", __func__, port->number, i,
+       dbg("%s - port %d, urb %d, len %d", __func__, port->number, i,
                                                        urb->actual_length);
        if (urb->status) {
-               dbg("%s - non-zero urb status: %d\n", __func__, urb->status);
+               dbg("%s - non-zero urb status: %d", __func__, urb->status);
                return;
        }
 
@@ -424,8 +409,6 @@ void usb_serial_generic_write_bulk_callback(struct urb *urb)
        int status = urb->status;
        int i;
 
-       dbg("%s - port %d", __func__, port->number);
-
        for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i)
                if (port->write_urbs[i] == urb)
                        break;
@@ -454,8 +437,6 @@ void usb_serial_generic_throttle(struct tty_struct *tty)
        struct usb_serial_port *port = tty->driver_data;
        unsigned long flags;
 
-       dbg("%s - port %d", __func__, port->number);
-
        /* Set the throttle request flag. It will be picked up
         * by usb_serial_generic_read_bulk_callback(). */
        spin_lock_irqsave(&port->lock, flags);
@@ -469,8 +450,6 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty)
        struct usb_serial_port *port = tty->driver_data;
        int was_throttled;
 
-       dbg("%s - port %d", __func__, port->number);
-
        /* Clear the throttle flags */
        spin_lock_irq(&port->lock);
        was_throttled = port->throttled;
@@ -566,8 +545,6 @@ void usb_serial_generic_disconnect(struct usb_serial *serial)
 {
        int i;
 
-       dbg("%s", __func__);
-
        /* stop reads and writes on all ports */
        for (i = 0; i < serial->num_ports; ++i)
                generic_cleanup(serial->port[i]);
@@ -576,5 +553,4 @@ EXPORT_SYMBOL_GPL(usb_serial_generic_disconnect);
 
 void usb_serial_generic_release(struct usb_serial *serial)
 {
-       dbg("%s", __func__);
 }