lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TIPC] Cleaned up info/warn/err macros

Browse Source 
Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
This commit is contained in:
Per Liden
2006-01-11 13:52:51 +01:00
committed by David S. Miller
parent 9ea1fd3c1a
commit d0a14a9dbd
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/tipc/core.h
View File

@@ -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 err(fmt, arg...) printk(KERN_ERR "TIPC: " fmt , ## arg)
#define info(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FILE__ , ## arg) #define info(fmt, arg...) printk(KERN_INFO "TIPC: " fmt , ## arg)
#define warn(fmt, arg...) printk(KERN_WARNING "%s: " fmt "\n" , __FILE__ , ## arg) #define warn(fmt, arg...) printk(KERN_WARNING "TIPC: " fmt , ## arg)
#define dbg(fmt, arg...) do {} while (0) #define dbg(fmt, arg...) do {} while (0)
#define msg_dbg(msg,txt) do {} while (0) #define msg_dbg(msg,txt) do {} while (0)

2
net/tipc/netlink.c
View File

@@ -100,7 +100,7 @@ int netlink_start(void)
genl_unregister_family(&family); genl_unregister_family(&family);
family_registered = 0; family_registered = 0;
err: err:
err("Failed to register netlink interface"); err("Failed to register netlink interface\n");
return -EFAULT; return -EFAULT;
} }

4
net/tipc/socket.c
View File

@@ -1696,13 +1696,13 @@ int socket_init(void)
res = proto_register(&tipc_proto, 1); res = proto_register(&tipc_proto, 1);
if (res) { if (res) {
err("Unable to register TIPC protocol type\n"); err("Failed to register TIPC protocol type\n");
goto out; goto out;
} }
res = sock_register(&tipc_family_ops); res = sock_register(&tipc_family_ops);
if (res) { if (res) {
err("Unable to register TIPC socket type\n"); err("Failed to register TIPC socket type\n");
proto_unregister(&tipc_proto); proto_unregister(&tipc_proto);
goto out; goto out;
} }

2
net/tipc/subscr.c
View File

@@ -488,7 +488,7 @@ int subscr_start(void)
return 0; return 0;
failed: failed:
err("Unable to create subscription service\n"); err("Failed to create subscription service\n");
tipc_detach(topsrv.user_ref); tipc_detach(topsrv.user_ref);
topsrv.user_ref = 0; topsrv.user_ref = 0;
spin_unlock_bh(&topsrv.lock); spin_unlock_bh(&topsrv.lock);