diff options
author | Joe Perches <joe@perches.com> | 2010-01-26 06:40:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-27 00:15:56 -0500 |
commit | 99824461ea72ca0044cc6508f02c0e1cabf37ba5 (patch) | |
tree | 8672e525869778c9d4c12fe3982306387995bf2a /net/atm/ioctl.c | |
parent | b747caf365b4121903b26d1cd65454c7bc607184 (diff) |
net/atm: Convert printk to pr_<level>
Add #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
Remove function names from output
Use single line pr_debug instead of broken multiple uses without newline
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/ioctl.c')
-rw-r--r-- | net/atm/ioctl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/atm/ioctl.c b/net/atm/ioctl.c index 2ea40995dced..b75afba1f72b 100644 --- a/net/atm/ioctl.c +++ b/net/atm/ioctl.c | |||
@@ -3,6 +3,7 @@ | |||
3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ | 3 | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ |
4 | /* 2003 John Levon <levon@movementarian.org> */ | 4 | /* 2003 John Levon <levon@movementarian.org> */ |
5 | 5 | ||
6 | #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ | ||
6 | 7 | ||
7 | #include <linux/module.h> | 8 | #include <linux/module.h> |
8 | #include <linux/kmod.h> | 9 | #include <linux/kmod.h> |
@@ -97,8 +98,8 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg | |||
97 | goto done; | 98 | goto done; |
98 | case ATM_SETSC: | 99 | case ATM_SETSC: |
99 | if (net_ratelimit()) | 100 | if (net_ratelimit()) |
100 | printk(KERN_WARNING "ATM_SETSC is obsolete; used by %s:%d\n", | 101 | pr_warning("ATM_SETSC is obsolete; used by %s:%d\n", |
101 | current->comm, task_pid_nr(current)); | 102 | current->comm, task_pid_nr(current)); |
102 | error = 0; | 103 | error = 0; |
103 | goto done; | 104 | goto done; |
104 | case ATMSIGD_CTRL: | 105 | case ATMSIGD_CTRL: |
@@ -123,7 +124,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg | |||
123 | to think about it at all. dwmw2. */ | 124 | to think about it at all. dwmw2. */ |
124 | if (compat) { | 125 | if (compat) { |
125 | if (net_ratelimit()) | 126 | if (net_ratelimit()) |
126 | printk(KERN_WARNING "32-bit task cannot be atmsigd\n"); | 127 | pr_warning("32-bit task cannot be atmsigd\n"); |
127 | error = -EINVAL; | 128 | error = -EINVAL; |
128 | goto done; | 129 | goto done; |
129 | } | 130 | } |