aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/f81232.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-15 19:27:17 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-15 19:27:17 -0400
commita94e9b94cc9b6d193bc69e6c9a3044aed4b7a5d9 (patch)
tree158aa2aea369d04f2977d7a1139a8a8899718b37 /drivers/usb/serial/f81232.c
parentc89aa63898f2238cd3c6537963a82b05146b9338 (diff)
USB: f81232.c: remove dbg() usage
dbg() is a usb-serial specific macro. This patch converts the f81232.c driver to use dev_dbg() instead to tie into the dynamic debug infrastructure. CC: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/f81232.c')
-rw-r--r--drivers/usb/serial/f81232.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c
index 5a247ff81908..499b15fd82f1 100644
--- a/drivers/usb/serial/f81232.c
+++ b/drivers/usb/serial/f81232.c
@@ -76,12 +76,12 @@ static void f81232_read_int_callback(struct urb *urb)
76 case -ENOENT: 76 case -ENOENT:
77 case -ESHUTDOWN: 77 case -ESHUTDOWN:
78 /* this urb is terminated, clean up */ 78 /* this urb is terminated, clean up */
79 dbg("%s - urb shutting down with status: %d", __func__, 79 dev_dbg(&port->dev, "%s - urb shutting down with status: %d\n",
80 status); 80 __func__, status);
81 return; 81 return;
82 default: 82 default:
83 dbg("%s - nonzero urb status received: %d", __func__, 83 dev_dbg(&port->dev, "%s - nonzero urb status received: %d\n",
84 status); 84 __func__, status);
85 goto exit; 85 goto exit;
86 } 86 }
87 87
@@ -131,7 +131,7 @@ static void f81232_process_read_urb(struct urb *urb)
131 tty_flag = TTY_PARITY; 131 tty_flag = TTY_PARITY;
132 else if (line_status & UART_FRAME_ERROR) 132 else if (line_status & UART_FRAME_ERROR)
133 tty_flag = TTY_FRAME; 133 tty_flag = TTY_FRAME;
134 dbg("%s - tty_flag = %d", __func__, tty_flag); 134 dev_dbg(&port->dev, "%s - tty_flag = %d\n", __func__, tty_flag);
135 135
136 /* overrun is special, not associated with a char */ 136 /* overrun is special, not associated with a char */
137 if (line_status & UART_OVERRUN_ERROR) 137 if (line_status & UART_OVERRUN_ERROR)
@@ -290,7 +290,9 @@ static int f81232_ioctl(struct tty_struct *tty,
290{ 290{
291 struct serial_struct ser; 291 struct serial_struct ser;
292 struct usb_serial_port *port = tty->driver_data; 292 struct usb_serial_port *port = tty->driver_data;
293 dbg("%s (%d) cmd = 0x%04x", __func__, port->number, cmd); 293
294 dev_dbg(&port->dev, "%s (%d) cmd = 0x%04x\n", __func__,
295 port->number, cmd);
294 296
295 switch (cmd) { 297 switch (cmd) {
296 case TIOCGSERIAL: 298 case TIOCGSERIAL:
@@ -306,10 +308,12 @@ static int f81232_ioctl(struct tty_struct *tty,
306 return 0; 308 return 0;
307 309
308 case TIOCMIWAIT: 310 case TIOCMIWAIT:
309 dbg("%s (%d) TIOCMIWAIT", __func__, port->number); 311 dev_dbg(&port->dev, "%s (%d) TIOCMIWAIT\n", __func__,
312 port->number);
310 return wait_modem_info(port, arg); 313 return wait_modem_info(port, arg);
311 default: 314 default:
312 dbg("%s not supported = 0x%04x", __func__, cmd); 315 dev_dbg(&port->dev, "%s not supported = 0x%04x\n",
316 __func__, cmd);
313 break; 317 break;
314 } 318 }
315 return -ENOIOCTLCMD; 319 return -ENOIOCTLCMD;