aboutsummaryrefslogtreecommitdiff
path: root/net/atm/ioctl.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-01-26 11:40:00 +0000
committerDavid S. Miller <davem@davemloft.net>2010-01-26 21:15:56 -0800
commit99824461ea72ca0044cc6508f02c0e1cabf37ba5 (patch)
tree8672e525869778c9d4c12fe3982306387995bf2a /net/atm/ioctl.c
parentb747caf365b4121903b26d1cd65454c7bc607184 (diff)
downloadlinux-stericsson-99824461ea72ca0044cc6508f02c0e1cabf37ba5.tar.gz
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.c7
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 @@
/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
/* 2003 John Levon <levon@movementarian.org> */
+#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
#include <linux/module.h>
#include <linux/kmod.h>
@@ -97,8 +98,8 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
goto done;
case ATM_SETSC:
if (net_ratelimit())
- printk(KERN_WARNING "ATM_SETSC is obsolete; used by %s:%d\n",
- current->comm, task_pid_nr(current));
+ pr_warning("ATM_SETSC is obsolete; used by %s:%d\n",
+ current->comm, task_pid_nr(current));
error = 0;
goto done;
case ATMSIGD_CTRL:
@@ -123,7 +124,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
to think about it at all. dwmw2. */
if (compat) {
if (net_ratelimit())
- printk(KERN_WARNING "32-bit task cannot be atmsigd\n");
+ pr_warning("32-bit task cannot be atmsigd\n");
error = -EINVAL;
goto done;
}