commit d0a14a9dbdf613d9307c4b748b03a11678fe8d16
author Per Liden <per.liden@nospam.ericsson.com> Wed Jan 11 13:52:51 2006 +0100
committer David S. Miller <davem@sunset.davemloft.net> Thu Jan 12 14:06:37 2006 -0800
tree 35914611062a16e5365e907207824d936830ba4e
parent 9ea1fd3c1a15c620d1e3d0aa269d34b705477003

[TIPC] Cleaned up info/warn/err macros

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

net/tipc/core.h

diff --git a/net/tipc/core.h b/net/tipc/core.h
index 4b29fb6..4f71fde 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -117,9 +117,9 @@
  * - 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)

net/tipc/netlink.c

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index de3eb45..7b96383 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -100,7 +100,7 @@
 	genl_unregister_family(&family);
 	family_registered = 0;
  err:
-	err("Failed to register netlink interface");
+	err("Failed to register netlink interface\n");
 	return -EFAULT;
 }
 

net/tipc/socket.c

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 1120d03..e0b429c 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1696,13 +1696,13 @@
 
         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) {
-		err("Unable to register TIPC socket type\n");
+		err("Failed to register TIPC socket type\n");
 		proto_unregister(&tipc_proto);
 		goto out;
 	}

net/tipc/subscr.c

diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index 9486d8e..b52959f 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -488,7 +488,7 @@
 	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);