Commit 92931d24 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: serial: core: clean up dbg and printk usage.

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fee84a54
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
* *
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -111,8 +113,7 @@ static int usb_console_setup(struct console *co, char *options) ...@@ -111,8 +113,7 @@ static int usb_console_setup(struct console *co, char *options)
serial = usb_serial_get_by_index(co->index); serial = usb_serial_get_by_index(co->index);
if (serial == NULL) { if (serial == NULL) {
/* no device is connected yet, sorry :( */ /* no device is connected yet, sorry :( */
printk(KERN_ERR "No USB device connected to ttyUSB%i\n", pr_err("No USB device connected to ttyUSB%i\n", co->index);
co->index);
return -ENODEV; return -ENODEV;
} }
...@@ -211,10 +212,10 @@ static void usb_console_write(struct console *co, ...@@ -211,10 +212,10 @@ static void usb_console_write(struct console *co,
if (count == 0) if (count == 0)
return; 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) { if (!port->port.console) {
dbg("%s - port not opened", __func__); pr_debug("%s - port not opened\n", __func__);
return; return;
} }
...@@ -235,7 +236,7 @@ static void usb_console_write(struct console *co, ...@@ -235,7 +236,7 @@ static void usb_console_write(struct console *co,
retval = serial->type->write(NULL, port, buf, i); retval = serial->type->write(NULL, port, buf, i);
else else
retval = usb_serial_generic_write(NULL, port, buf, i); 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) { if (lf) {
/* append CR after LF */ /* append CR after LF */
unsigned char cr = 13; unsigned char cr = 13;
...@@ -245,7 +246,7 @@ static void usb_console_write(struct console *co, ...@@ -245,7 +246,7 @@ static void usb_console_write(struct console *co,
else else
retval = usb_serial_generic_write(NULL, retval = usb_serial_generic_write(NULL,
port, &cr, 1); port, &cr, 1);
dbg("%s - return value : %d", __func__, retval); pr_debug("%s - return value : %d\n", __func__, retval);
} }
buf += i; buf += i;
count -= i; count -= i;
...@@ -300,7 +301,7 @@ void usb_serial_console_init(int serial_debug, int minor) ...@@ -300,7 +301,7 @@ void usb_serial_console_init(int serial_debug, int minor)
* register_console). console_write() is called immediately * register_console). console_write() is called immediately
* from register_console iff CON_PRINTBUFFER is set in flags. * 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); register_console(&usbcons);
} }
} }
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment