[TIPC] Cleaned up info/warn/err macros

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

authored by

Per Liden and committed by
David S. Miller
d0a14a9d 9ea1fd3c

+7 -7
+3 -3
net/tipc/core.h
··· 117 117 * - debug messages are not printed 118 118 */ 119 119 120 - #define err(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __FILE__ , ## arg) 121 - #define info(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FILE__ , ## arg) 122 - #define warn(fmt, arg...) printk(KERN_WARNING "%s: " fmt "\n" , __FILE__ , ## arg) 120 + #define err(fmt, arg...) printk(KERN_ERR "TIPC: " fmt , ## arg) 121 + #define info(fmt, arg...) printk(KERN_INFO "TIPC: " fmt , ## arg) 122 + #define warn(fmt, arg...) printk(KERN_WARNING "TIPC: " fmt , ## arg) 123 123 124 124 #define dbg(fmt, arg...) do {} while (0) 125 125 #define msg_dbg(msg,txt) do {} while (0)
+1 -1
net/tipc/netlink.c
··· 100 100 genl_unregister_family(&family); 101 101 family_registered = 0; 102 102 err: 103 - err("Failed to register netlink interface"); 103 + err("Failed to register netlink interface\n"); 104 104 return -EFAULT; 105 105 } 106 106
+2 -2
net/tipc/socket.c
··· 1696 1696 1697 1697 res = proto_register(&tipc_proto, 1); 1698 1698 if (res) { 1699 - err("Unable to register TIPC protocol type\n"); 1699 + err("Failed to register TIPC protocol type\n"); 1700 1700 goto out; 1701 1701 } 1702 1702 1703 1703 res = sock_register(&tipc_family_ops); 1704 1704 if (res) { 1705 - err("Unable to register TIPC socket type\n"); 1705 + err("Failed to register TIPC socket type\n"); 1706 1706 proto_unregister(&tipc_proto); 1707 1707 goto out; 1708 1708 }
+1 -1
net/tipc/subscr.c
··· 488 488 return 0; 489 489 490 490 failed: 491 - err("Unable to create subscription service\n"); 491 + err("Failed to create subscription service\n"); 492 492 tipc_detach(topsrv.user_ref); 493 493 topsrv.user_ref = 0; 494 494 spin_unlock_bh(&topsrv.lock);