1 files changed, 1 insertions, 44 deletions

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index afc886c75d2f..b78c34eb5d3f 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -89,13 +89,6 @@ static const struct usb_device_id id_table_combined[] = {
 
 MODULE_DEVICE_TABLE(usb, id_table_combined);
 
-static struct usb_driver cypress_driver = {
-        .name =         "cypress",
-        .probe =        usb_serial_probe,
-        .disconnect =   usb_serial_disconnect,
-        .id_table =     id_table_combined,
-};
-
 enum packet_format {
         packet_format_1,  /* b0:status, b1:payload count */
         packet_format_2   /* b0[7:3]:status, b0[2:0]:payload count */
@@ -305,8 +298,6 @@ static int cypress_serial_control(struct tty_struct *tty,
         const unsigned int feature_len = 5;
         unsigned long flags;
 
-        dbg("%s", __func__);
-
         priv = usb_get_serial_port_data(port);
 
         if (!priv->comm_is_ok)
@@ -451,8 +442,6 @@ static int generic_startup(struct usb_serial *serial)
         struct cypress_private *priv;
         struct usb_serial_port *port = serial->port[0];
 
-        dbg("%s - port %d", __func__, port->number);
-
         priv = kzalloc(sizeof(struct cypress_private), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
@@ -505,8 +494,6 @@ static int cypress_earthmate_startup(struct usb_serial *serial)
         struct cypress_private *priv;
         struct usb_serial_port *port = serial->port[0];
 
-        dbg("%s", __func__);
-
         if (generic_startup(serial)) {
                 dbg("%s - Failed setting up port %d", __func__,
                                 port->number);
@@ -537,8 +524,6 @@ static int cypress_hidcom_startup(struct usb_serial *serial)
 {
         struct cypress_private *priv;
 
-        dbg("%s", __func__);
-
         if (generic_startup(serial)) {
                 dbg("%s - Failed setting up port %d", __func__,
                                 serial->port[0]->number);
@@ -556,8 +541,6 @@ static int cypress_ca42v2_startup(struct usb_serial *serial)
 {
         struct cypress_private *priv;
 
-        dbg("%s", __func__);
-
         if (generic_startup(serial)) {
                 dbg("%s - Failed setting up port %d", __func__,
                                 serial->port[0]->number);
@@ -575,10 +558,7 @@ static void cypress_release(struct usb_serial *serial)
 {
         struct cypress_private *priv;
 
-        dbg("%s - port %d", __func__, serial->port[0]->number);
-
         /* all open ports are closed at this point */
-
         priv = usb_get_serial_port_data(serial->port[0]);
 
         if (priv) {
@@ -595,8 +575,6 @@ static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port)
         unsigned long flags;
         int result = 0;
 
-        dbg("%s - port %d", __func__, port->number);
-
         if (!priv->comm_is_ok)
                 return -EIO;
 
@@ -661,8 +639,6 @@ static void cypress_close(struct usb_serial_port *port)
         struct cypress_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
 
-        dbg("%s - port %d", __func__, port->number);
-
         /* writing is potentially harmful, lock must be taken */
         mutex_lock(&port->serial->disc_mutex);
         if (port->serial->disconnected) {
@@ -720,7 +696,6 @@ static void cypress_send(struct usb_serial_port *port)
         if (!priv->comm_is_ok)
                 return;
 
-        dbg("%s - port %d", __func__, port->number);
         dbg("%s - interrupt out size is %d", __func__,
                                                 port->interrupt_out_size);
 
@@ -828,8 +803,6 @@ static int cypress_write_room(struct tty_struct *tty)
         int room = 0;
         unsigned long flags;
 
-        dbg("%s - port %d", __func__, port->number);
-
         spin_lock_irqsave(&priv->lock, flags);
         room = kfifo_avail(&priv->write_fifo);
         spin_unlock_irqrestore(&priv->lock, flags);
@@ -847,8 +820,6 @@ static int cypress_tiocmget(struct tty_struct *tty)
         unsigned int result = 0;
         unsigned long flags;
 
-        dbg("%s - port %d", __func__, port->number);
-
         spin_lock_irqsave(&priv->lock, flags);
         control = priv->line_control;
         status = priv->current_status;
@@ -874,8 +845,6 @@ static int cypress_tiocmset(struct tty_struct *tty,
         struct cypress_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
 
-        dbg("%s - port %d", __func__, port->number);
-
         spin_lock_irqsave(&priv->lock, flags);
         if (set & TIOCM_RTS)
                 priv->line_control |= CONTROL_RTS;
@@ -948,8 +917,6 @@ static void cypress_set_termios(struct tty_struct *tty,
         __u8 oldlines;
         int linechange = 0;
 
-        dbg("%s - port %d", __func__, port->number);
-
         spin_lock_irqsave(&priv->lock, flags);
         /* We can't clean this one up as we don't know the device type
            early enough */
@@ -1096,8 +1063,6 @@ static int cypress_chars_in_buffer(struct tty_struct *tty)
         int chars = 0;
         unsigned long flags;
 
-        dbg("%s - port %d", __func__, port->number);
-
         spin_lock_irqsave(&priv->lock, flags);
         chars = kfifo_len(&priv->write_fifo);
         spin_unlock_irqrestore(&priv->lock, flags);
@@ -1112,8 +1077,6 @@ static void cypress_throttle(struct tty_struct *tty)
         struct usb_serial_port *port = tty->driver_data;
         struct cypress_private *priv = usb_get_serial_port_data(port);
 
-        dbg("%s - port %d", __func__, port->number);
-
         spin_lock_irq(&priv->lock);
         priv->rx_flags = THROTTLED;
         spin_unlock_irq(&priv->lock);
@@ -1126,8 +1089,6 @@ static void cypress_unthrottle(struct tty_struct *tty)
         struct cypress_private *priv = usb_get_serial_port_data(port);
         int actually_throttled, result;
 
-        dbg("%s - port %d", __func__, port->number);
-
         spin_lock_irq(&priv->lock);
         actually_throttled = priv->rx_flags & ACTUALLY_THROTTLED;
         priv->rx_flags = 0;
@@ -1161,8 +1122,6 @@ static void cypress_read_int_callback(struct urb *urb)
         int i = 0;
         int status = urb->status;
 
-        dbg("%s - port %d", __func__, port->number);
-
         switch (status) {
         case 0: /* success */
                 break;
@@ -1303,8 +1262,6 @@ static void cypress_write_int_callback(struct urb *urb)
         int result;
         int status = urb->status;
 
-        dbg("%s - port %d", __func__, port->number);
-
         switch (status) {
         case 0:
                 /* success */
@@ -1346,7 +1303,7 @@ static void cypress_write_int_callback(struct urb *urb)
         cypress_send(port);
 }
 
-module_usb_serial_driver(cypress_driver, serial_drivers);
+module_usb_serial_driver(serial_drivers, id_table_combined);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);