Patchwork netlink: cleanup the unnecessary return value check

login
register
mail settings
Submitter zhanghonghui@huawei.com
Date Oct. 23, 2012, 8:21 a.m.
Message ID <1350980483-4992-1-git-send-email-zhanghonghui@huawei.com>
Download mbox | patch
Permalink /patch/193389/
State Accepted
Delegated to: David Miller
Headers show

Comments

zhanghonghui@huawei.com - Oct. 23, 2012, 8:21 a.m.
From: Hans Zhang <zhanghonghui@huawei.com>

It's no needed to check the return value of tab since the NULL situation
has been handled already, and the rtnl_msg_handlers[PF_UNSPEC] has been
initialized as non-NULL during the rtnetlink_init().

Signed-off-by: Hans Zhang <zhanghonghui@huawei.com>
---
 net/core/rtnetlink.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
David Miller - Oct. 23, 2012, 5:04 p.m.
From: <zhanghonghui@huawei.com>
Date: Tue, 23 Oct 2012 16:21:23 +0800

> From: Hans Zhang <zhanghonghui@huawei.com>
> 
> It's no needed to check the return value of tab since the NULL situation
> has been handled already, and the rtnl_msg_handlers[PF_UNSPEC] has been
> initialized as non-NULL during the rtnetlink_init().
> 
> Signed-off-by: Hans Zhang <zhanghonghui@huawei.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 76d4c2c..64fe3cc 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -128,7 +128,7 @@  static rtnl_doit_func rtnl_get_doit(int protocol, int msgindex)
 	if (tab == NULL || tab[msgindex].doit == NULL)
 		tab = rtnl_msg_handlers[PF_UNSPEC];
 
-	return tab ? tab[msgindex].doit : NULL;
+	return tab[msgindex].doit;
 }
 
 static rtnl_dumpit_func rtnl_get_dumpit(int protocol, int msgindex)
@@ -143,7 +143,7 @@  static rtnl_dumpit_func rtnl_get_dumpit(int protocol, int msgindex)
 	if (tab == NULL || tab[msgindex].dumpit == NULL)
 		tab = rtnl_msg_handlers[PF_UNSPEC];
 
-	return tab ? tab[msgindex].dumpit : NULL;
+	return tab[msgindex].dumpit;
 }
 
 static rtnl_calcit_func rtnl_get_calcit(int protocol, int msgindex)
@@ -158,7 +158,7 @@  static rtnl_calcit_func rtnl_get_calcit(int protocol, int msgindex)
 	if (tab == NULL || tab[msgindex].calcit == NULL)
 		tab = rtnl_msg_handlers[PF_UNSPEC];
 
-	return tab ? tab[msgindex].calcit : NULL;
+	return tab[msgindex].calcit;
 }
 
 /**