Skip to content

Commit

Permalink
hso: Convert printk to pr_<level>
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Joe Perches authored and David S. Miller committed Sep 6, 2016
1 parent 95a6911 commit 3981cce
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions drivers/net/usb/hso.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
*
*****************************************************************************/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/init.h>
Expand Down Expand Up @@ -638,7 +640,7 @@ static int get_free_serial_index(void)
}
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;
}

Expand Down Expand Up @@ -1102,7 +1104,7 @@ static void _hso_serial_set_termios(struct tty_struct *tty,
struct hso_serial *serial = tty->driver_data;

if (!serial) {
printk(KERN_ERR "%s: no tty structures", __func__);
pr_err("%s: no tty structures", __func__);
return;
}

Expand Down Expand Up @@ -1347,7 +1349,7 @@ static int hso_serial_write(struct tty_struct *tty, const unsigned char *buf,

/* sanity check */
if (serial == NULL) {
printk(KERN_ERR "%s: serial is NULL\n", __func__);
pr_err("%s: serial is NULL\n", __func__);
return -ENODEV;
}

Expand Down Expand Up @@ -1773,7 +1775,7 @@ static int mux_device_request(struct hso_serial *serial, u8 type, u16 port,

/* Sanity check */
if (!serial || !ctrl_urb || !ctrl_req) {
printk(KERN_ERR "%s: Wrong arguments\n", __func__);
pr_err("%s: Wrong arguments\n", __func__);
return -EINVAL;
}

Expand Down Expand Up @@ -3220,7 +3222,7 @@ static int __init hso_init(void)
int result;

/* put it in the log */
printk(KERN_INFO "hso: %s\n", version);
pr_info("%s\n", version);

/* Initialise the serial table semaphore and table */
spin_lock_init(&serial_table_lock);
Expand Down Expand Up @@ -3251,16 +3253,15 @@ static int __init hso_init(void)
/* register the tty driver */
result = tty_register_driver(tty_drv);
if (result) {
printk(KERN_ERR "%s - tty_register_driver failed(%d)\n",
__func__, result);
pr_err("%s - tty_register_driver failed(%d)\n",
__func__, result);
goto err_free_tty;
}

/* register this module as an usb driver */
result = usb_register(&hso_driver);
if (result) {
printk(KERN_ERR "Could not register hso driver? error: %d\n",
result);
pr_err("Could not register hso driver - error: %d\n", result);
goto err_unreg_tty;
}

Expand All @@ -3275,7 +3276,7 @@ static int __init hso_init(void)

static void __exit hso_exit(void)
{
printk(KERN_INFO "hso: unloaded\n");
pr_info("unloaded\n");

tty_unregister_driver(tty_drv);
put_tty_driver(tty_drv);
Expand Down

0 comments on commit 3981cce

Please sign in to comment.