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/net.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/net.c')
-rw-r--r-- | net/tipc/net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index 7c236c89cf5e..5b5cea259caf 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
@@ -184,9 +184,9 @@ int tipc_net_start(u32 addr) | |||
184 | 184 | ||
185 | tipc_cfg_reinit(); | 185 | tipc_cfg_reinit(); |
186 | 186 | ||
187 | info("Started in network mode\n"); | 187 | pr_info("Started in network mode\n"); |
188 | info("Own node address %s, network identity %u\n", | 188 | pr_info("Own node address %s, network identity %u\n", |
189 | tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id); | 189 | tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id); |
190 | return 0; | 190 | return 0; |
191 | } | 191 | } |
192 | 192 | ||
@@ -202,5 +202,5 @@ void tipc_net_stop(void) | |||
202 | list_for_each_entry_safe(node, t_node, &tipc_node_list, list) | 202 | list_for_each_entry_safe(node, t_node, &tipc_node_list, list) |
203 | tipc_node_delete(node); | 203 | tipc_node_delete(node); |
204 | write_unlock_bh(&tipc_net_lock); | 204 | write_unlock_bh(&tipc_net_lock); |
205 | info("Left network mode\n"); | 205 | pr_info("Left network mode\n"); |
206 | } | 206 | } |