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, 4 insertions, 4 deletions

diff --git a/net/tipc/port.c b/net/tipc/port.c
index 70bf78bd5b75..2cbac3956fc9 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -191,7 +191,7 @@ void tipc_port_recv_mcast(struct sk_buff *buf, struct tipc_port_list *dp)
                         struct sk_buff *b = skb_clone(buf, GFP_ATOMIC);
 
                         if (b == NULL) {
-                                warn("Unable to deliver multicast message(s)\n");
+                                pr_warn("Unable to deliver multicast message(s)\n");
                                 goto exit;
                         }
                         if ((index == 0) && (cnt != 0))
@@ -221,12 +221,12 @@ struct tipc_port *tipc_createport_raw(void *usr_handle,
 
         p_ptr = kzalloc(sizeof(*p_ptr), GFP_ATOMIC);
         if (!p_ptr) {
-                warn("Port creation failed, no memory\n");
+                pr_warn("Port creation failed, no memory\n");
                 return NULL;
         }
         ref = tipc_ref_acquire(p_ptr, &p_ptr->lock);
         if (!ref) {
-                warn("Port creation failed, reference table exhausted\n");
+                pr_warn("Port creation failed, ref. table exhausted\n");
                 kfree(p_ptr);
                 return NULL;
         }
@@ -906,7 +906,7 @@ int tipc_createport(void *usr_handle,
 
         up_ptr = kmalloc(sizeof(*up_ptr), GFP_ATOMIC);
         if (!up_ptr) {
-                warn("Port creation failed, no memory\n");
+                pr_warn("Port creation failed, no memory\n");
                 return -ENOMEM;
         }
         p_ptr = tipc_createport_raw(NULL, port_dispatcher, port_wakeup,