USB: serial: remove usb_serial_disconnect call in all drivers

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

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index d39b9418f2fb3d884f64d0d08506967c9a27f346..37fb911c1cc06f427863af63be14baff83d7f823 100644 (file)
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -79,8 +79,6 @@ MODULE_DEVICE_TABLE(usb, id_table);
 
 static struct usb_driver cyberjack_driver = {
        .name =         "cyberjack",
-       .probe =        usb_serial_probe,
-       .disconnect =   usb_serial_disconnect,
        .id_table =     id_table,
 };
 
@@ -122,8 +120,6 @@ static int cyberjack_startup(struct usb_serial *serial)
        struct cyberjack_private *priv;
        int i;
 
-       dbg("%s", __func__);
-
        /* allocate the private data structure */
        priv = kmalloc(sizeof(struct cyberjack_private), GFP_KERNEL);
        if (!priv)
@@ -155,8 +151,6 @@ static void cyberjack_disconnect(struct usb_serial *serial)
 {
        int i;
 
-       dbg("%s", __func__);
-
        for (i = 0; i < serial->num_ports; ++i)
                usb_kill_urb(serial->port[i]->interrupt_in_urb);
 }
@@ -165,8 +159,6 @@ static void cyberjack_release(struct usb_serial *serial)
 {
        int i;
 
-       dbg("%s", __func__);
-
        for (i = 0; i < serial->num_ports; ++i) {
                /* My special items, the standard routines free my urbs */
                kfree(usb_get_serial_port_data(serial->port[i]));
@@ -180,8 +172,6 @@ static int  cyberjack_open(struct tty_struct *tty,
        unsigned long flags;
        int result = 0;
 
-       dbg("%s - port %d", __func__, port->number);
-
        dbg("%s - usb_clear_halt", __func__);
        usb_clear_halt(port->serial->dev, port->write_urb->pipe);
 
@@ -197,8 +187,6 @@ static int  cyberjack_open(struct tty_struct *tty,
 
 static void cyberjack_close(struct usb_serial_port *port)
 {
-       dbg("%s - port %d", __func__, port->number);
-
        if (port->serial->dev) {
                /* shutdown any bulk reads that might be going on */
                usb_kill_urb(port->write_urb);
@@ -214,8 +202,6 @@ static int cyberjack_write(struct tty_struct *tty,
        int result;
        int wrexpected;
 
-       dbg("%s - port %d", __func__, port->number);
-
        if (count == 0) {
                dbg("%s - write request of 0 bytes", __func__);
                return 0;
@@ -307,8 +293,6 @@ static void cyberjack_read_int_callback(struct urb *urb)
        int status = urb->status;
        int result;
 
-       dbg("%s - port %d", __func__, port->number);
-
        /* the urb might have been killed. */
        if (status)
                return;
@@ -367,8 +351,6 @@ static void cyberjack_read_bulk_callback(struct urb *urb)
        int result;
        int status = urb->status;
 
-       dbg("%s - port %d", __func__, port->number);
-
        usb_serial_debug_data(debug, &port->dev, __func__,
                                                urb->actual_length, data);
        if (status) {
@@ -417,8 +399,6 @@ static void cyberjack_write_bulk_callback(struct urb *urb)
        struct cyberjack_private *priv = usb_get_serial_port_data(port);
        int status = urb->status;
 
-       dbg("%s - port %d", __func__, port->number);
-
        set_bit(0, &port->write_urbs_free);
        if (status) {
                dbg("%s - nonzero write bulk status received: %d",