1 files changed, 1 insertions, 26 deletions

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index d39b9418f2fb..3aa0b530f68e 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -77,13 +77,6 @@ static const struct usb_device_id id_table[] = {
 
 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,
-};
-
 static struct usb_serial_driver cyberjack_device = {
         .driver = {
                 .owner =        THIS_MODULE,
@@ -122,8 +115,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 +146,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 +154,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 +167,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 +182,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 +197,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 +288,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 +346,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 +394,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",
@@ -475,7 +450,7 @@ exit:
         usb_serial_port_softint(port);
 }
 
-module_usb_serial_driver(cyberjack_driver, serial_drivers);
+module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);