1 files changed, 1 insertions, 52 deletions

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index a39ddd1b0dca..a1b99243dac9 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -130,15 +130,13 @@ struct keyspan_port_private {
 #include "keyspan_usa67msg.h"
 
 
-module_usb_serial_driver(keyspan_driver, serial_drivers);
+module_usb_serial_driver(serial_drivers, keyspan_ids_combined);
 
 static void keyspan_break_ctl(struct tty_struct *tty, int break_state)
 {
         struct usb_serial_port *port = tty->driver_data;
         struct keyspan_port_private     *p_priv;
 
-        dbg("%s", __func__);
-
         p_priv = usb_get_serial_port_data(port);
 
         if (break_state == -1)
@@ -158,8 +156,6 @@ static void keyspan_set_termios(struct tty_struct *tty,
         const struct keyspan_device_details     *d_details;
         unsigned int                    cflag;
 
-        dbg("%s", __func__);
-
         p_priv = usb_get_serial_port_data(port);
         d_details = p_priv->device_details;
         cflag = tty->termios->c_cflag;
@@ -306,8 +302,6 @@ static void	usa26_indat_callback(struct urb *urb)
         unsigned char           *data = urb->transfer_buffer;
         int status = urb->status;
 
-        dbg("%s", __func__);
-
         endpoint = usb_pipeendpoint(urb->pipe);
 
         if (status) {
@@ -369,8 +363,6 @@ static void	usa2x_outdat_callback(struct urb *urb)
 
 static void     usa26_inack_callback(struct urb *urb)
 {
-        dbg("%s", __func__);
-
 }
 
 static void     usa26_outcont_callback(struct urb *urb)
@@ -452,7 +444,6 @@ exit: ;
 
 static void     usa26_glocont_callback(struct urb *urb)
 {
-        dbg("%s", __func__);
 }
 
 
@@ -465,8 +456,6 @@ static void usa28_indat_callback(struct urb *urb)
         struct keyspan_port_private             *p_priv;
         int status = urb->status;
 
-        dbg("%s", __func__);
-
         port =  urb->context;
         p_priv = usb_get_serial_port_data(port);
         data = urb->transfer_buffer;
@@ -505,7 +494,6 @@ static void usa28_indat_callback(struct urb *urb)
 
 static void     usa28_inack_callback(struct urb *urb)
 {
-        dbg("%s", __func__);
 }
 
 static void     usa28_outcont_callback(struct urb *urb)
@@ -585,7 +573,6 @@ exit: ;
 
 static void     usa28_glocont_callback(struct urb *urb)
 {
-        dbg("%s", __func__);
 }
 
 
@@ -596,8 +583,6 @@ static void	usa49_glocont_callback(struct urb *urb)
         struct keyspan_port_private *p_priv;
         int i;
 
-        dbg("%s", __func__);
-
         serial =  urb->context;
         for (i = 0; i < serial->num_ports; ++i) {
                 port = serial->port[i];
@@ -625,8 +610,6 @@ static void	usa49_instat_callback(struct urb *urb)
         int old_dcd_state;
         int status = urb->status;
 
-        dbg("%s", __func__);
-
         serial =  urb->context;
 
         if (status) {
@@ -679,7 +662,6 @@ exit:	;
 
 static void     usa49_inack_callback(struct urb *urb)
 {
-        dbg("%s", __func__);
 }
 
 static void     usa49_indat_callback(struct urb *urb)
@@ -691,8 +673,6 @@ static void	usa49_indat_callback(struct urb *urb)
         unsigned char           *data = urb->transfer_buffer;
         int status = urb->status;
 
-        dbg("%s", __func__);
-
         endpoint = usb_pipeendpoint(urb->pipe);
 
         if (status) {
@@ -742,8 +722,6 @@ static void usa49wg_indat_callback(struct urb *urb)
         unsigned char           *data = urb->transfer_buffer;
         int status = urb->status;
 
-        dbg("%s", __func__);
-
         serial = urb->context;
 
         if (status) {
@@ -806,7 +784,6 @@ static void usa49wg_indat_callback(struct urb *urb)
 /* not used, usa-49 doesn't have per-port control endpoints */
 static void usa49_outcont_callback(struct urb *urb)
 {
-        dbg("%s", __func__);
 }
 
 static void usa90_indat_callback(struct urb *urb)
@@ -819,8 +796,6 @@ static void usa90_indat_callback(struct urb *urb)
         unsigned char           *data = urb->transfer_buffer;
         int status = urb->status;
 
-        dbg("%s", __func__);
-
         endpoint = usb_pipeendpoint(urb->pipe);
 
         if (status) {
@@ -957,8 +932,6 @@ static void	usa67_instat_callback(struct urb *urb)
         int old_dcd_state;
         int status = urb->status;
 
-        dbg("%s", __func__);
-
         serial = urb->context;
 
         if (status) {
@@ -1010,8 +983,6 @@ static void usa67_glocont_callback(struct urb *urb)
         struct keyspan_port_private *p_priv;
         int i;
 
-        dbg("%s", __func__);
-
         serial = urb->context;
         for (i = 0; i < serial->num_ports; ++i) {
                 port = serial->port[i];
@@ -1035,7 +1006,6 @@ static int keyspan_write_room(struct tty_struct *tty)
         int                             data_len;
         struct urb                      *this_urb;
 
-        dbg("%s", __func__);
         p_priv = usb_get_serial_port_data(port);
         d_details = p_priv->device_details;
 
@@ -1078,8 +1048,6 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
         p_priv = usb_get_serial_port_data(port);
         d_details = p_priv->device_details;
 
-        dbg("%s - port%d.", __func__, port->number);
-
         /* Set some sane defaults */
         p_priv->rts_state = 1;
         p_priv->dtr_state = 1;
@@ -1165,7 +1133,6 @@ static void keyspan_close(struct usb_serial_port *port)
         struct keyspan_serial_private   *s_priv;
         struct keyspan_port_private     *p_priv;
 
-        dbg("%s", __func__);
         s_priv = usb_get_serial_data(serial);
         p_priv = usb_get_serial_port_data(port);
 
@@ -1438,8 +1405,6 @@ static void keyspan_setup_urbs(struct usb_serial *serial)
         struct callbacks                *cback;
         int                             endp;
 
-        dbg("%s", __func__);
-
         s_priv = usb_get_serial_data(serial);
         d_details = s_priv->device_details;
 
@@ -1853,8 +1818,6 @@ static int keyspan_usa28_send_setup(struct usb_serial *serial,
         struct urb                              *this_urb;
         int                                     device_port, err;
 
-        dbg("%s", __func__);
-
         s_priv = usb_get_serial_data(serial);
         p_priv = usb_get_serial_port_data(port);
         d_details = s_priv->device_details;
@@ -1980,8 +1943,6 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
         struct urb                              *this_urb;
         int                                     err, device_port;
 
-        dbg("%s", __func__);
-
         s_priv = usb_get_serial_data(serial);
         p_priv = usb_get_serial_port_data(port);
         d_details = s_priv->device_details;
@@ -2168,8 +2129,6 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
         int                                     err;
         u8                                              prescaler;
 
-        dbg("%s", __func__);
-
         s_priv = usb_get_serial_data(serial);
         p_priv = usb_get_serial_port_data(port);
         d_details = s_priv->device_details;
@@ -2300,8 +2259,6 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial,
         struct urb                              *this_urb;
         int                                     err, device_port;
 
-        dbg("%s", __func__);
-
         s_priv = usb_get_serial_data(serial);
         p_priv = usb_get_serial_port_data(port);
         d_details = s_priv->device_details;
@@ -2442,8 +2399,6 @@ static void keyspan_send_setup(struct usb_serial_port *port, int reset_port)
         struct keyspan_serial_private *s_priv;
         const struct keyspan_device_details *d_details;
 
-        dbg("%s", __func__);
-
         s_priv = usb_get_serial_data(serial);
         d_details = s_priv->device_details;
 
@@ -2477,8 +2432,6 @@ static int keyspan_startup(struct usb_serial *serial)
         struct keyspan_port_private     *p_priv;
         const struct keyspan_device_details     *d_details;
 
-        dbg("%s", __func__);
-
         for (i = 0; (d_details = keyspan_devices[i]) != NULL; ++i)
                 if (d_details->product_id ==
                                 le16_to_cpu(serial->dev->descriptor.idProduct))
@@ -2538,8 +2491,6 @@ static void keyspan_disconnect(struct usb_serial *serial)
         struct keyspan_serial_private   *s_priv;
         struct keyspan_port_private     *p_priv;
 
-        dbg("%s", __func__);
-
         s_priv = usb_get_serial_data(serial);
 
         /* Stop reading/writing urbs */
@@ -2579,8 +2530,6 @@ static void keyspan_release(struct usb_serial *serial)
         struct usb_serial_port          *port;
         struct keyspan_serial_private   *s_priv;
 
-        dbg("%s", __func__);
-
         s_priv = usb_get_serial_data(serial);
 
         /*  dbg("Freeing serial->private."); */