From: Fabian Frederick <fabf@skynet.be>
Date: Wed, 8 Oct 2014 18:37:01 +0000 (+0200)
Subject: netlabel: directly return netlbl_unlabel_genl_init()
X-Git-Tag: v3.18-rc1~115^2~1
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=16b99a4f6644d58c94acb4b4253e84049de588c5;p=cascardo%2Flinux.git

netlabel: directly return netlbl_unlabel_genl_init()

No need to store netlbl_unlabel_genl_init result and test it before returning.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c
index 1e779bb7fa43..adf8b7900da2 100644
--- a/net/netlabel/netlabel_user.c
+++ b/net/netlabel/netlabel_user.c
@@ -71,11 +71,7 @@ int __init netlbl_netlink_init(void)
 	if (ret_val != 0)
 		return ret_val;
 
-	ret_val = netlbl_unlabel_genl_init();
-	if (ret_val != 0)
-		return ret_val;
-
-	return 0;
+	return netlbl_unlabel_genl_init();
 }
 
 /*