USB: serial: keyspan: remove dbg() usage

dbg() was a very old USB-serial-specific macro.
This patch removes it from being used in the keyspan
driver and uses dev_dbg() instead.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 159 insertions, 148 deletions

diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index f0d4f3fcf4f7..0d37581fabb1 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -165,7 +165,7 @@ static void keyspan_set_termios(struct tty_struct *tty,
            so other rates can be generated if desired. */
         baud_rate = tty_get_baud_rate(tty);
         /* If no match or invalid, don't change */
-        if (d_details->calculate_baud_rate(baud_rate, d_details->baudclk,
+        if (d_details->calculate_baud_rate(port, baud_rate, d_details->baudclk,
                                 NULL, NULL, NULL, device_port) == KEYSPAN_BAUD_RATE_OK) {
                 /* FIXME - more to do here to ensure rate changes cleanly */
                 /* FIXME - calcuate exact rate from divisor ? */
@@ -241,8 +241,8 @@ static int keyspan_write(struct tty_struct *tty,
                 dataOffset = 1;
         }
 
-        dbg("%s - for port %d (%d chars), flip=%d",
-            __func__, port->number, count, p_priv->out_flip);
+        dev_dbg(&port->dev, "%s - for port %d (%d chars), flip=%d\n",
+                __func__, port->number, count, p_priv->out_flip);
 
         for (left = count; left > 0; left -= todo) {
                 todo = left;
@@ -255,11 +255,11 @@ static int keyspan_write(struct tty_struct *tty,
                 this_urb = p_priv->out_urbs[flip];
                 if (this_urb == NULL) {
                         /* no bulk out, so return 0 bytes written */
-                        dbg("%s - no output urb :(", __func__);
+                        dev_dbg(&port->dev, "%s - no output urb :(\n", __func__);
                         return count;
                 }
 
-                dbg("%s - endpoint %d flip %d",
+                dev_dbg(&port->dev, "%s - endpoint %d flip %d\n",
                         __func__, usb_pipeendpoint(this_urb->pipe), flip);
 
                 if (this_urb->status == -EINPROGRESS) {
@@ -282,7 +282,7 @@ static int keyspan_write(struct tty_struct *tty,
 
                 err = usb_submit_urb(this_urb, GFP_ATOMIC);
                 if (err != 0)
-                        dbg("usb_submit_urb(write bulk) failed (%d)", err);
+                        dev_dbg(&port->dev, "usb_submit_urb(write bulk) failed (%d)\n", err);
                 p_priv->tx_start_time[flip] = jiffies;
 
                 /* Flip for next time if usa26 or usa28 interface
@@ -305,8 +305,8 @@ static void	usa26_indat_callback(struct urb *urb)
         endpoint = usb_pipeendpoint(urb->pipe);
 
         if (status) {
-                dbg("%s - nonzero status: %x on endpoint %d.",
-                    __func__, status, endpoint);
+                dev_dbg(&urb->dev->dev,"%s - nonzero status: %x on endpoint %d.\n",
+                        __func__, status, endpoint);
                 return;
         }
 
@@ -325,7 +325,7 @@ static void	usa26_indat_callback(struct urb *urb)
                                 tty_insert_flip_char(tty, data[i], err);
                 } else {
                         /* some bytes had errors, every byte has status */
-                        dbg("%s - RX error!!!!", __func__);
+                        dev_dbg(&port->dev, "%s - RX error!!!!\n", __func__);
                         for (i = 0; i + 1 < urb->actual_length; i += 2) {
                                 int stat = data[i], flag = 0;
                                 if (stat & RXERROR_OVERRUN)
@@ -345,7 +345,7 @@ static void	usa26_indat_callback(struct urb *urb)
         /* Resubmit urb so we continue receiving */
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
-                dbg("%s - resubmit read urb failed. (%d)", __func__, err);
+                dev_dbg(&port->dev, "%s - resubmit read urb failed. (%d)\n", __func__, err);
 }
 
 /* Outdat handling is common for all devices */
@@ -356,7 +356,7 @@ static void	usa2x_outdat_callback(struct urb *urb)
 
         port =  urb->context;
         p_priv = usb_get_serial_port_data(port);
-        dbg("%s - urb %d", __func__, urb == p_priv->out_urbs[1]);
+        dev_dbg(&port->dev, "%s - urb %d\n", __func__, urb == p_priv->out_urbs[1]);
 
         usb_serial_port_softint(port);
 }
@@ -374,7 +374,7 @@ static void	usa26_outcont_callback(struct urb *urb)
         p_priv = usb_get_serial_port_data(port);
 
         if (p_priv->resend_cont) {
-                dbg("%s - sending setup", __func__);
+                dev_dbg(&port->dev, "%s - sending setup\n", __func__);
                 keyspan_usa26_send_setup(port->serial, port,
                                                 p_priv->resend_cont - 1);
         }
@@ -394,20 +394,22 @@ static void	usa26_instat_callback(struct urb *urb)
         serial =  urb->context;
 
         if (status) {
-                dbg("%s - nonzero status: %x", __func__, status);
+                dev_dbg(&urb->dev->dev, "%s - nonzero status: %x\n", __func__, status);
                 return;
         }
         if (urb->actual_length != 9) {
-                dbg("%s - %d byte report??", __func__, urb->actual_length);
+                dev_dbg(&urb->dev->dev, "%s - %d byte report??\n", __func__, urb->actual_length);
                 goto exit;
         }
 
         msg = (struct keyspan_usa26_portStatusMessage *)data;
 
 #if 0
-        dbg("%s - port status: port %d cts %d dcd %d dsr %d ri %d toff %d txoff %d rxen %d cr %d",
-            __func__, msg->port, msg->hskia_cts, msg->gpia_dcd, msg->dsr, msg->ri, msg->_txOff,
-            msg->_txXoff, msg->rxEnabled, msg->controlResponse);
+        dev_dbg(&urb->dev->dev,
+                "%s - port status: port %d cts %d dcd %d dsr %d ri %d toff %d txoff %d rxen %d cr %d",
+                __func__, msg->port, msg->hskia_cts, msg->gpia_dcd, msg->dsr,
+                msg->ri, msg->_txOff, msg->_txXoff, msg->rxEnabled,
+                msg->controlResponse);
 #endif
 
         /* Now do something useful with the data */
@@ -415,7 +417,7 @@ static void	usa26_instat_callback(struct urb *urb)
 
         /* Check port number from message and retrieve private data */
         if (msg->port >= serial->num_ports) {
-                dbg("%s - Unexpected port number %d", __func__, msg->port);
+                dev_dbg(&urb->dev->dev, "%s - Unexpected port number %d\n", __func__, msg->port);
                 goto exit;
         }
         port = serial->port[msg->port];
@@ -438,7 +440,7 @@ static void	usa26_instat_callback(struct urb *urb)
         /* Resubmit urb so we continue receiving */
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
-                dbg("%s - resubmit read urb failed. (%d)", __func__, err);
+                dev_dbg(&port->dev, "%s - resubmit read urb failed. (%d)\n", __func__, err);
 exit: ;
 }
 
@@ -465,8 +467,8 @@ static void usa28_indat_callback(struct urb *urb)
 
         do {
                 if (status) {
-                        dbg("%s - nonzero status: %x on endpoint %d.",
-                            __func__, status, usb_pipeendpoint(urb->pipe));
+                        dev_dbg(&urb->dev->dev, "%s - nonzero status: %x on endpoint %d.\n",
+                                __func__, status, usb_pipeendpoint(urb->pipe));
                         return;
                 }
 
@@ -484,7 +486,7 @@ static void usa28_inda