Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0a14a9d authored by Per Liden's avatar Per Liden Committed by David S. Miller
Browse files

[TIPC] Cleaned up info/warn/err macros 



Signed-off-by: default avatarPer Liden <per.liden@nospam.ericsson.com>
parent 9ea1fd3c

net/tipc/core.h

+3 −3
Original line number Diff line number Diff line
@@ -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)

net/tipc/netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

net/tipc/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

net/tipc/subscr.c

+1 −1
Original line number Diff line number Diff line
@@ -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);