1 files changed, 1 insertions, 43 deletions

diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 5fdc33c6a3c0..5976b65ab6ee 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -66,13 +66,6 @@ static const struct usb_device_id id_table[] = {
 
 MODULE_DEVICE_TABLE(usb, id_table);
 
-static struct usb_driver oti6858_driver = {
-        .name =         "oti6858",
-        .probe =        usb_serial_probe,
-        .disconnect =   usb_serial_disconnect,
-        .id_table =     id_table,
-};
-
 static bool debug;
 
 /* requests */
@@ -211,8 +204,6 @@ static void setup_line(struct work_struct *work)
         unsigned long flags;
         int result;
 
-        dbg("%s(port = %d)", __func__, port->number);
-
         new_setup = kmalloc(OTI6858_CTRL_PKT_SIZE, GFP_KERNEL);
         if (new_setup == NULL) {
                 dev_err(&port->dev, "%s(): out of memory!\n", __func__);
@@ -282,8 +273,6 @@ static void send_data(struct work_struct *work)
         unsigned long flags;
         u8 *allow;
 
-        dbg("%s(port = %d)", __func__, port->number);
-
         spin_lock_irqsave(&priv->lock, flags);
         if (priv->flags.write_urb_in_use) {
                 spin_unlock_irqrestore(&priv->lock, flags);
@@ -379,8 +368,6 @@ static int oti6858_startup(struct usb_serial *serial)
 static int oti6858_write(struct tty_struct *tty, struct usb_serial_port *port,
                         const unsigned char *buf, int count)
 {
-        dbg("%s(port = %d, count = %d)", __func__, port->number, count);
-
         if (!count)
                 return count;
 
@@ -395,8 +382,6 @@ static int oti6858_write_room(struct tty_struct *tty)
         int room = 0;
         unsigned long flags;
 
-        dbg("%s(port = %d)", __func__, port->number);
-
         spin_lock_irqsave(&port->lock, flags);
         room = kfifo_avail(&port->write_fifo);
         spin_unlock_irqrestore(&port->lock, flags);
@@ -410,8 +395,6 @@ static int oti6858_chars_in_buffer(struct tty_struct *tty)
         int chars = 0;
         unsigned long flags;
 
-        dbg("%s(port = %d)", __func__, port->number);
-
         spin_lock_irqsave(&port->lock, flags);
         chars = kfifo_len(&port->write_fifo);
         spin_unlock_irqrestore(&port->lock, flags);
@@ -437,8 +420,6 @@ static void oti6858_set_termios(struct tty_struct *tty,
         __le16 divisor;
         int br;
 
-        dbg("%s(port = %d)", __func__, port->number);
-
         if (!tty) {
                 dbg("%s(): no tty structures", __func__);
                 return;
@@ -545,8 +526,6 @@ static int oti6858_open(struct tty_struct *tty, struct usb_serial_port *port)
         unsigned long flags;
         int result;
 
-        dbg("%s(port = %d)", __func__, port->number);
-
         usb_clear_halt(serial->dev, port->write_urb->pipe);
         usb_clear_halt(serial->dev, port->read_urb->pipe);
 
@@ -602,8 +581,6 @@ static void oti6858_close(struct usb_serial_port *port)
         struct oti6858_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
 
-        dbg("%s(port = %d)", __func__, port->number);
-
         spin_lock_irqsave(&port->lock, flags);
         /* clear out any remaining data in the buffer */
         kfifo_reset_out(&port->write_fifo);
@@ -633,9 +610,6 @@ static int oti6858_tiocmset(struct tty_struct *tty,
         dbg("%s(port = %d, set = 0x%08x, clear = 0x%08x)",
                                 __func__, port->number, set, clear);
 
-        if (!usb_get_intfdata(port->serial->interface))
-                return -ENODEV;
-
         /* FIXME: check if this is correct (active high/low) */
         spin_lock_irqsave(&priv->lock, flags);
         control = priv->pending_setup.control;
@@ -663,11 +637,6 @@ static int oti6858_tiocmget(struct tty_struct *tty)
         unsigned pin_state;
         unsigned result = 0;
 
-        dbg("%s(port = %d)", __func__, port->number);
-
-        if (!usb_get_intfdata(port->serial->interface))
-                return -ENODEV;
-
         spin_lock_irqsave(&priv->lock, flags);
         pin_state = priv->status.pin_state & PIN_MASK;
         spin_unlock_irqrestore(&priv->lock, flags);
@@ -750,8 +719,6 @@ static void oti6858_release(struct usb_serial *serial)
 {
         int i;
 
-        dbg("%s()", __func__);
-
         for (i = 0; i < serial->num_ports; ++i)
                 kfree(usb_get_serial_port_data(serial->port[i]));
 }
@@ -763,9 +730,6 @@ static void oti6858_read_int_callback(struct urb *urb)
         int transient = 0, can_recv = 0, resubmit = 1;
         int status = urb->status;
 
-        dbg("%s(port = %d, status = %d)",
-                                __func__, port->number, status);
-
         switch (status) {
         case 0:
                 /* success */
@@ -882,9 +846,6 @@ static void oti6858_read_bulk_callback(struct urb *urb)
         int status = urb->status;
         int result;
 
-        dbg("%s(port = %d, status = %d)",
-                                __func__, port->number, status);
-
         spin_lock_irqsave(&priv->lock, flags);
         priv->flags.read_urb_in_use = 0;
         spin_unlock_irqrestore(&priv->lock, flags);
@@ -916,9 +877,6 @@ static void oti6858_write_bulk_callback(struct urb *urb)
         int status = urb->status;
         int result;
 
-        dbg("%s(port = %d, status = %d)",
-                                __func__, port->number, status);
-
         switch (status) {
         case 0:
                 /* success */
@@ -958,7 +916,7 @@ static void oti6858_write_bulk_callback(struct urb *urb)
         }
 }
 
-module_usb_serial_driver(oti6858_driver, serial_drivers);
+module_usb_serial_driver(serial_drivers, id_table);
 
 MODULE_DESCRIPTION(OTI6858_DESCRIPTION);
 MODULE_AUTHOR(OTI6858_AUTHOR);