USB: serial: ipw.c: remove dbg() usage

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

CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Alan Stern <stern@rowland.harvard.edu>
CC: Mauro Carvalho Chehab <mchehab@redhat.com>
CC: "Bjørn Mork" <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 28 insertions, 33 deletions

diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index 2cb30c535839..fbd54a1bab30 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -142,7 +142,8 @@ static bool debug;
 
 static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
-        struct usb_device *dev = port->serial->dev;
+        struct usb_device *udev = port->serial->dev;
+        struct device *dev = &port->dev;
         u8 buf_flow_static[16] = IPW_BYTES_FLOWINIT;
         u8 *buf_flow_init;
         int result;
@@ -154,8 +155,8 @@ static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port)
         /* --1: Tell the modem to initialize (we think) From sniffs this is
          *      always the first thing that gets sent to the modem during
          *      opening of the device */
-        dbg("%s: Sending SIO_INIT (we guess)", __func__);
-        result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+        dev_dbg(dev, "%s: Sending SIO_INIT (we guess)\n", __func__);
+        result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                          IPW_SIO_INIT,
                          USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
                          0,
@@ -164,22 +165,19 @@ static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port)
                          0,
                          100000);
         if (result < 0)
-                dev_err(&port->dev,
-                        "Init of modem failed (error = %d)\n", result);
+                dev_err(dev, "Init of modem failed (error = %d)\n", result);
 
         /* reset the bulk pipes */
-        usb_clear_halt(dev,
-                        usb_rcvbulkpipe(dev, port->bulk_in_endpointAddress));
-        usb_clear_halt(dev,
-                        usb_sndbulkpipe(dev, port->bulk_out_endpointAddress));
+        usb_clear_halt(udev, usb_rcvbulkpipe(udev, port->bulk_in_endpointAddress));
+        usb_clear_halt(udev, usb_sndbulkpipe(udev, port->bulk_out_endpointAddress));
 
         /*--2: Start reading from the device */
-        dbg("%s: setting up bulk read callback", __func__);
+        dev_dbg(dev, "%s: setting up bulk read callback\n", __func__);
         usb_wwan_open(tty, port);
 
         /*--3: Tell the modem to open the floodgates on the rx bulk channel */
-        dbg("%s:asking modem for RxRead (RXBULK_ON)", __func__);
-        result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+        dev_dbg(dev, "%s:asking modem for RxRead (RXBULK_ON)\n", __func__);
+        result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                          IPW_SIO_RXCTL,
                          USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
                          IPW_RXBULK_ON,
@@ -188,12 +186,11 @@ static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port)
                          0,
                          100000);
         if (result < 0)
-                dev_err(&port->dev,
-                        "Enabling bulk RxRead failed (error = %d)\n", result);
+                dev_err(dev, "Enabling bulk RxRead failed (error = %d)\n", result);
 
         /*--4: setup the initial flowcontrol */
-        dbg("%s:setting init flowcontrol (%s)", __func__, buf_flow_init);
-        result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+        dev_dbg(dev, "%s:setting init flowcontrol (%s)\n", __func__, buf_flow_init);
+        result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                          IPW_SIO_HANDFLOW,
                          USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
                          0,
@@ -202,8 +199,7 @@ static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port)
                          0x10,
                          200000);
         if (result < 0)
-                dev_err(&port->dev,
-                        "initial flowcontrol failed (error = %d)\n", result);
+                dev_err(dev, "initial flowcontrol failed (error = %d)\n", result);
 
         kfree(buf_flow_init);
         return 0;
@@ -233,12 +229,13 @@ static void ipw_release(struct usb_serial *serial)
 
 static void ipw_dtr_rts(struct usb_serial_port *port, int on)
 {
-        struct usb_device *dev = port->serial->dev;
+        struct usb_device *udev = port->serial->dev;
+        struct device *dev = &port->dev;
         int result;
 
-        dbg("%s: on = %d", __func__, on);
+        dev_dbg(dev, "%s: on = %d\n", __func__, on);
 
-        result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+        result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                          IPW_SIO_SET_PIN,
                          USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
                          on ? IPW_PIN_SETDTR : IPW_PIN_CLRDTR,
@@ -247,10 +244,9 @@ static void ipw_dtr_rts(struct usb_serial_port *port, int on)
                          0,
                          200000);
         if (result < 0)
-                dev_err(&port->dev, "setting dtr failed (error = %d)\n",
-                                                                result);
+                dev_err(dev, "setting dtr failed (error = %d)\n", result);
 
-        result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+        result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                          IPW_SIO_SET_PIN, USB_TYPE_VENDOR |
                                         USB_RECIP_INTERFACE | USB_DIR_OUT,
                          on ? IPW_PIN_SETRTS : IPW_PIN_CLRRTS,
@@ -259,18 +255,18 @@ static void ipw_dtr_rts(struct usb_serial_port *port, int on)
                          0,
                          200000);
         if (result < 0)
-                dev_err(&port->dev, "setting rts failed (error = %d)\n",
-                                                                result);
+                dev_err(dev, "setting rts failed (error = %d)\n", result);
 }
 
 static void ipw_close(struct usb_serial_port *port)
 {
-        struct usb_device *dev = port->serial->dev;
+        struct usb_device *udev = port->serial->dev;
+        struct device *dev = &port->dev;
         int result;
 
         /*--3: purge */
-        dbg("%s:sending purge", __func__);
-        result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+        dev_dbg(dev, "%s:sending purge\n", __func__);
+        result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                          IPW_SIO_PURGE, USB_TYPE_VENDOR |
                                         USB_RECIP_INTERFACE | USB_DIR_OUT,
                          0x03,
@@ -279,12 +275,12 @@ static void ipw_close(struct usb_serial_port *port)
                          0,
                          200000);
         if (result < 0)
-                dev_err(&port->dev, "purge failed (error = %d)\n", result);
+                dev_err(dev, "purge failed (error = %d)\n", result);
 
 
         /* send RXBULK_off (tell modem to stop transmitting bulk data on
            rx chan) */
-        result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+        result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
                          IPW_SIO_RXCTL,
                          USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
                          IPW_RXBULK_OFF,
@@ -294,8 +290,7 @@ static void ipw_close(struct usb_serial_port *port)
                          100000);
 
         if (result < 0)
-                dev_err(&port->dev,
-                        "Disabling bulk RxRead failed (error = %d)\n", result);
+                dev_err(dev, "Disabling bulk RxRead failed (error = %d)\n", result);
 
         usb_wwan_close(port);
 }