Skip to content

Commit

Permalink
USB: serial: core: clean up dbg and printk usage.
Browse files Browse the repository at this point in the history
This cleans up the usb-serial module to remove all old usages of dbg()
and "raw" printk() calls for error reporting (there are some info
messages left for now.)

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Sep 13, 2012
1 parent fee84a5 commit 92931d2
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 84 deletions.
15 changes: 8 additions & 7 deletions drivers/usb/serial/console.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
*
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/slab.h>
Expand Down Expand Up @@ -111,8 +113,7 @@ static int usb_console_setup(struct console *co, char *options)
serial = usb_serial_get_by_index(co->index);
if (serial == NULL) {
/* no device is connected yet, sorry :( */
printk(KERN_ERR "No USB device connected to ttyUSB%i\n",
co->index);
pr_err("No USB device connected to ttyUSB%i\n", co->index);
return -ENODEV;
}

Expand Down Expand Up @@ -211,10 +212,10 @@ static void usb_console_write(struct console *co,
if (count == 0)
return;

dbg("%s - port %d, %d byte(s)", __func__, port->number, count);
pr_debug("%s - port %d, %d byte(s)\n", __func__, port->number, count);

if (!port->port.console) {
dbg("%s - port not opened", __func__);
pr_debug("%s - port not opened\n", __func__);
return;
}

Expand All @@ -235,7 +236,7 @@ static void usb_console_write(struct console *co,
retval = serial->type->write(NULL, port, buf, i);
else
retval = usb_serial_generic_write(NULL, port, buf, i);
dbg("%s - return value : %d", __func__, retval);
pr_debug("%s - return value : %d\n", __func__, retval);
if (lf) {
/* append CR after LF */
unsigned char cr = 13;
Expand All @@ -245,7 +246,7 @@ static void usb_console_write(struct console *co,
else
retval = usb_serial_generic_write(NULL,
port, &cr, 1);
dbg("%s - return value : %d", __func__, retval);
pr_debug("%s - return value : %d\n", __func__, retval);
}
buf += i;
count -= i;
Expand Down Expand Up @@ -300,7 +301,7 @@ void usb_serial_console_init(int serial_debug, int minor)
* register_console). console_write() is called immediately
* from register_console iff CON_PRINTBUFFER is set in flags.
*/
dbg("registering the USB serial console.");
pr_debug("registering the USB serial console.\n");
register_console(&usbcons);
}
}
Expand Down
Loading

0 comments on commit 92931d2

Please sign in to comment.