diff options
| author | Per Liden <per.liden@nospam.ericsson.com> | 2006-01-11 13:52:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-12 14:06:37 -0800 |
| commit | d0a14a9dbdf613d9307c4b748b03a11678fe8d16 (patch) | |
| tree | 35914611062a16e5365e907207824d936830ba4e | |
| parent | 9ea1fd3c1a15c620d1e3d0aa269d34b705477003 (diff) | |
[TIPC] Cleaned up info/warn/err macros
Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
| -rw-r--r-- | net/tipc/core.h | 6 | ||||
| -rw-r--r-- | net/tipc/netlink.c | 2 | ||||
| -rw-r--r-- | net/tipc/socket.c | 4 | ||||
| -rw-r--r-- | net/tipc/subscr.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h index 4b29fb63c8f..4f71fde023e 100644 --- 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 */ -#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) diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c index de3eb45a668..7b963833964 100644 --- 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: - err("Failed to register netlink interface"); + err("Failed to register netlink interface\n"); return -EFAULT; } diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 1120d034031..e0b429c20ba 100644 --- 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) { - 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; } diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c index 9486d8ee98b..b52959fca5e 100644 --- a/net/tipc/subscr.c +++ b/net/tipc/subscr.c @@ -488,7 +488,7 @@ int subscr_start(void) 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); |