diff options
author | Erik Hugne <erik.hugne@ericsson.com> | 2012-06-29 00:16:37 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-07-13 19:24:44 -0400 |
commit | 2cf8aa19fe8bec578b707daa383ebff80e3f81a1 (patch) | |
tree | bd800510d0e01d441e25dd476228462106eaa9ea /net/tipc/handler.c | |
parent | f705ab956b3a0377181c9d73b235ad5bf4020937 (diff) |
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 <erik.hugne@ericsson.com>
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
[PG: use pr_fmt as suggested by Joe Perches <joe@perches.com>]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
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) | |||
57 | struct queue_item *item; | 57 | struct queue_item *item; |
58 | 58 | ||
59 | if (!handler_enabled) { | 59 | if (!handler_enabled) { |
60 | err("Signal request ignored by handler\n"); | 60 | pr_err("Signal request ignored by handler\n"); |
61 | return -ENOPROTOOPT; | 61 | return -ENOPROTOOPT; |
62 | } | 62 | } |
63 | 63 | ||
64 | spin_lock_bh(&qitem_lock); | 64 | spin_lock_bh(&qitem_lock); |
65 | item = kmem_cache_alloc(tipc_queue_item_cache, GFP_ATOMIC); | 65 | item = kmem_cache_alloc(tipc_queue_item_cache, GFP_ATOMIC); |
66 | if (!item) { | 66 | if (!item) { |
67 | err("Signal queue out of memory\n"); | 67 | pr_err("Signal queue out of memory\n"); |
68 | spin_unlock_bh(&qitem_lock); | 68 | spin_unlock_bh(&qitem_lock); |
69 | return -ENOMEM; | 69 | return -ENOMEM; |
70 | } | 70 | } |