[TIPC] Cleaned up info/warn/err macros

Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>

diff --git a/net/tipc/core.h b/net/tipc/core.h
index 4b29fb63c8fe15768e94a99f1008da76fa329dd3..4f71fde023e182c2b8ccc59abdd26a4ca9d83601 100644 (file)
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -117,9 +117,9 @@ void tipc_dump(struct print_buf*,const char *fmt, ...);
  * - debug messages are not printed
  */
 
  * - debug messages are not printed
  */
 

-#define err(fmt, arg...)  printk(KERN_ERR "%s: " fmt "\n" , __FILE__ , ## arg)
-#define info(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FILE__ , ## arg)
-#define warn(fmt, arg...) printk(KERN_WARNING "%s: " fmt "\n" , __FILE__ , ## arg)
+#define err(fmt, arg...)  printk(KERN_ERR "TIPC: " fmt , ## arg)
+#define info(fmt, arg...) printk(KERN_INFO "TIPC: " fmt , ## arg)
+#define warn(fmt, arg...) printk(KERN_WARNING "TIPC: " fmt , ## arg)

 
 #define dbg(fmt, arg...) do {} while (0)
 #define msg_dbg(msg,txt) do {} while (0)
 
 #define dbg(fmt, arg...) do {} while (0)
 #define msg_dbg(msg,txt) do {} while (0)

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index de3eb45a668371dceb6424e2e3344871a33f5d59..7b963833964a5c82bf47d53f7ea5da3016b59a10 100644 (file)
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -100,7 +100,7 @@ int netlink_start(void)
        genl_unregister_family(&family);
        family_registered = 0;
  err:
        genl_unregister_family(&family);
        family_registered = 0;
  err:

-       err("Failed to register netlink interface");
+       err("Failed to register netlink interface\n");

        return -EFAULT;
 }
 
        return -EFAULT;
 }
 

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 1120d0340310db9fe1c51e283a10d672ffaf3a95..e0b429c20baf02d5f38c3ed34945d86f1c80098f 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1696,13 +1696,13 @@ int socket_init(void)
 
         res = proto_register(&tipc_proto, 1);
        if (res) {
 
         res = proto_register(&tipc_proto, 1);
        if (res) {

-               err("Unable to register TIPC protocol type\n");
+               err("Failed to register TIPC protocol type\n");

                goto out;
        }
 
        res = sock_register(&tipc_family_ops);
        if (res) {
                goto out;
        }
 
        res = sock_register(&tipc_family_ops);
        if (res) {

-               err("Unable to register TIPC socket type\n");
+               err("Failed to register TIPC socket type\n");

                proto_unregister(&tipc_proto);
                goto out;
        }
                proto_unregister(&tipc_proto);
                goto out;
        }

diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index 9486d8ee98b823b3461540c6226961e31444d1b7..b52959fca5e631ca39383e44d9ccba1017b83d13 100644 (file)
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -488,7 +488,7 @@ int subscr_start(void)
        return 0;
 
 failed:
        return 0;
 
 failed:

-       err("Unable to create subscription service\n");
+       err("Failed to create subscription service\n");

        tipc_detach(topsrv.user_ref);
        topsrv.user_ref = 0;
        spin_unlock_bh(&topsrv.lock);
        tipc_detach(topsrv.user_ref);
        topsrv.user_ref = 0;
        spin_unlock_bh(&topsrv.lock);