2014-10-08 18:37:06

by Fabian Frédérick

[permalink] [raw]
Subject: [PATCH 1/1 net-next] 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 <[email protected]>
---
net/netlabel/netlabel_user.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/net/netlabel/netlabel_user.c b/net/netlabel/netlabel_user.c
index 1e779bb..adf8b79 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();
}

/*
--
1.9.1


2014-10-08 20:09:23

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 1/1 net-next] netlabel: directly return netlbl_unlabel_genl_init()

From: Fabian Frederick <[email protected]>
Date: Wed, 8 Oct 2014 20:37:01 +0200

> No need to store netlbl_unlabel_genl_init result and test it before returning.
>
> Signed-off-by: Fabian Frederick <[email protected]>

Applied.