diff options
| author | Erik Hugne <[email protected]> | 2012-06-29 04:16:37 +0000 |
|---|---|---|
| committer | Paul Gortmaker <[email protected]> | 2012-07-13 23:24:44 +0000 |
| commit | 2cf8aa19fe8bec578b707daa383ebff80e3f81a1 (patch) | |
| tree | bd800510d0e01d441e25dd476228462106eaa9ea /net/tipc/handler.c | |
| parent | tipc: limit error messages relating to memory leak to one line (diff) | |
| download | kernel-2cf8aa19fe8bec578b707daa383ebff80e3f81a1.tar.gz kernel-2cf8aa19fe8bec578b707daa383ebff80e3f81a1.zip | |
tipc: use standard printk shortcut macros (pr_err etc.)
All messages should go directly to the kernel log. The TIPC
specific error, warning, info and debug trace macro's are
removed and all references replaced with pr_err, pr_warn,
pr_info and pr_debug.
Commonly used sub-strings are explicitly declared as a const
char to reduce .text size.
Note that this means the debug messages (changed to pr_debug),
are now enabled through dynamic debugging, instead of a TIPC
specific Kconfig option (TIPC_DEBUG). The latter will be
phased out completely
Signed-off-by: Erik Hugne <[email protected]>
Signed-off-by: Jon Maloy <[email protected]>
[PG: use pr_fmt as suggested by Joe Perches <[email protected]>]
Signed-off-by: Paul Gortmaker <[email protected]>
Diffstat (limited to 'net/tipc/handler.c')
| -rw-r--r-- | net/tipc/handler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/handler.c b/net/tipc/handler.c index 9c6f22ff1c6d..7a52d3922f3c 100644 --- a/net/tipc/handler.c +++ b/net/tipc/handler.c @@ -57,14 +57,14 @@ unsigned int tipc_k_signal(Handler routine, unsigned long argument) struct queue_item *item; if (!handler_enabled) { - err("Signal request ignored by handler\n"); + pr_err("Signal request ignored by handler\n"); return -ENOPROTOOPT; } spin_lock_bh(&qitem_lock); item = kmem_cache_alloc(tipc_queue_item_cache, GFP_ATOMIC); if (!item) { - err("Signal queue out of memory\n"); + pr_err("Signal queue out of memory\n"); spin_unlock_bh(&qitem_lock); return -ENOMEM; } |
