tipc: use standard printk shortcut macros (pr_err etc.)

[karo-tx-linux.git] / net / tipc / node.c

diff --git a/net/tipc/node.c b/net/tipc/node.c
index d4fd341e6e0dcd67f9d7565423041b3a8af1da33..d21db204e25a181527822fa02599e391b4c40fe8 100644 (file)
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -105,7 +105,7 @@ struct tipc_node *tipc_node_create(u32 addr)
        n_ptr = kzalloc(sizeof(*n_ptr), GFP_ATOMIC);
        if (!n_ptr) {
                spin_unlock_bh(&node_create_lock);
-               warn("Node creation failed, no memory\n");
+               pr_warn("Node creation failed, no memory\n");
                return NULL;
        }
 
@@ -151,8 +151,8 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
 
        n_ptr->working_links++;
 
-       info("Established link <%s> on network plane %c\n",
-            l_ptr->name, l_ptr->b_ptr->net_plane);
+       pr_info("Established link <%s> on network plane %c\n",
+               l_ptr->name, l_ptr->b_ptr->net_plane);
 
        if (!active[0]) {
                active[0] = active[1] = l_ptr;
@@ -160,7 +160,7 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
                return;
        }
        if (l_ptr->priority < active[0]->priority) {
-               info("New link <%s> becomes standby\n", l_ptr->name);
+               pr_info("New link <%s> becomes standby\n", l_ptr->name);
                return;
        }
        tipc_link_send_duplicate(active[0], l_ptr);
@@ -168,9 +168,9 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
                active[0] = l_ptr;
                return;
        }
-       info("Old link <%s> becomes standby\n", active[0]->name);
+       pr_info("Old link <%s> becomes standby\n", active[0]->name);
        if (active[1] != active[0])
-               info("Old link <%s> becomes standby\n", active[1]->name);
+               pr_info("Old link <%s> becomes standby\n", active[1]->name);
        active[0] = active[1] = l_ptr;
 }
 
@@ -211,11 +211,11 @@ void tipc_node_link_down(struct tipc_node *n_ptr, struct tipc_link *l_ptr)
        n_ptr->working_links--;
 
        if (!tipc_link_is_active(l_ptr)) {
-               info("Lost standby link <%s> on network plane %c\n",
-                    l_ptr->name, l_ptr->b_ptr->net_plane);
+               pr_info("Lost standby link <%s> on network plane %c\n",
+                       l_ptr->name, l_ptr->b_ptr->net_plane);
                return;
        }
-       info("Lost link <%s> on network plane %c\n",
+       pr_info("Lost link <%s> on network plane %c\n",
                l_ptr->name, l_ptr->b_ptr->net_plane);
 
        active = &n_ptr->active_links[0];
@@ -290,8 +290,8 @@ static void node_lost_contact(struct tipc_node *n_ptr)
        char addr_string[16];
        u32 i;
 
-       info("Lost contact with %s\n",
-            tipc_addr_string_fill(addr_string, n_ptr->addr));
+       pr_info("Lost contact with %s\n",
+               tipc_addr_string_fill(addr_string, n_ptr->addr));
 
        /* Flush broadcast link info associated with lost node */
        if (n_ptr->bclink.supported) {