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>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/tipc/config.c b/net/tipc/config.c
index c5712a343810..7978fdd99299 100644
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -432,7 +432,7 @@ static void cfg_named_msg_event(void *userdata,
         if ((size < sizeof(*req_hdr)) ||
             (size != TCM_ALIGN(ntohl(req_hdr->tcm_len))) ||
             (ntohs(req_hdr->tcm_flags) != TCM_F_REQUEST)) {
-                warn("Invalid configuration message discarded\n");
+                pr_warn("Invalid configuration message discarded\n");
                 return;
         }
 
@@ -478,7 +478,7 @@ int tipc_cfg_init(void)
         return 0;
 
 failed:
-        err("Unable to create configuration service\n");
+        pr_err("Unable to create configuration service\n");
         return res;
 }
 
@@ -494,7 +494,7 @@ void tipc_cfg_reinit(void)
         seq.lower = seq.upper = tipc_own_addr;
         res = tipc_publish(config_port_ref, TIPC_ZONE_SCOPE, &seq);
         if (res)
-                err("Unable to reinitialize configuration service\n");
+                pr_err("Unable to reinitialize configuration service\n");
 }
 
 void tipc_cfg_stop(void)