UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

hso: Convert printk to pr_<level> 

Use a more common logging style

Miscellanea:

o Add pr_fmt to prefix each output message
o Realign arguments

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2016-09-02 15:58:02 -07:00 committed by David S. Miller
parent 95a6911797
commit 3981cce673
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/usb/hso.c
View File

@ -50,6 +50,8 @@
* *
*****************************************************************************/ *****************************************************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/init.h> #include <linux/init.h>
@ -638,7 +640,7 @@ static int get_free_serial_index(void)
} }
spin_unlock_irqrestore(&serial_table_lock, flags); spin_unlock_irqrestore(&serial_table_lock, flags);
printk(KERN_ERR "%s: no free serial devices in table\n", __func__); pr_err("%s: no free serial devices in table\n", __func__);
return -1; return -1;
} }
@ -1102,7 +1104,7 @@ static void _hso_serial_set_termios(struct tty_struct *tty,
struct hso_serial *serial = tty->driver_data; struct hso_serial *serial = tty->driver_data;
if (!serial) { if (!serial) {
printk(KERN_ERR "%s: no tty structures", __func__); pr_err("%s: no tty structures", __func__);
return; return;
} }
@ -1347,7 +1349,7 @@ static int hso_serial_write(struct tty_struct *tty, const unsigned char *buf,
/* sanity check */ /* sanity check */
if (serial == NULL) { if (serial == NULL) {
printk(KERN_ERR "%s: serial is NULL\n", __func__); pr_err("%s: serial is NULL\n", __func__);
return -ENODEV; return -ENODEV;
} }
@ -1773,7 +1775,7 @@ static int mux_device_request(struct hso_serial *serial, u8 type, u16 port,
/* Sanity check */ /* Sanity check */
if (!serial || !ctrl_urb || !ctrl_req) { if (!serial || !ctrl_urb || !ctrl_req) {
printk(KERN_ERR "%s: Wrong arguments\n", __func__); pr_err("%s: Wrong arguments\n", __func__);
return -EINVAL; return -EINVAL;
} }
@ -3220,7 +3222,7 @@ static int __init hso_init(void)
int result; int result;
/* put it in the log */ /* put it in the log */
printk(KERN_INFO "hso: %s\n", version); pr_info("%s\n", version);
/* Initialise the serial table semaphore and table */ /* Initialise the serial table semaphore and table */
spin_lock_init(&serial_table_lock); spin_lock_init(&serial_table_lock);
@ -3251,16 +3253,15 @@ static int __init hso_init(void)
/* register the tty driver */ /* register the tty driver */
result = tty_register_driver(tty_drv); result = tty_register_driver(tty_drv);
if (result) { if (result) {
printk(KERN_ERR "%s - tty_register_driver failed(%d)\n", pr_err("%s - tty_register_driver failed(%d)\n",
__func__, result); __func__, result);
goto err_free_tty; goto err_free_tty;
} }
/* register this module as an usb driver */ /* register this module as an usb driver */
result = usb_register(&hso_driver); result = usb_register(&hso_driver);
if (result) { if (result) {
printk(KERN_ERR "Could not register hso driver? error: %d\n", pr_err("Could not register hso driver - error: %d\n", result);
result);
goto err_unreg_tty; goto err_unreg_tty;
} }
@ -3275,7 +3276,7 @@ err_free_tty:
static void __exit hso_exit(void) static void __exit hso_exit(void)
{ {
printk(KERN_INFO "hso: unloaded\n"); pr_info("unloaded\n");
tty_unregister_driver(tty_drv); tty_unregister_driver(tty_drv);
put_tty_driver(tty_drv); put_tty_driver(tty_drv);