[PATCH net-next] team: Simplify return path of team_newlink

The variable "err" is not necessary.
Return register_netdevice() directly.

Signed-off-by: Toshiaki Makita <redacted>
---
 drivers/net/team/team.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index b4958c7..ef10302 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c

@@ -2045,16 +2045,10 @@ static void team_setup(struct net_device *dev)
 static int team_newlink(struct net *src_net, struct net_device *dev,
 			struct nlattr *tb[], struct nlattr *data[])
 {
-	int err;
-
 	if (tb[IFLA_ADDRESS] == NULL)
 		eth_hw_addr_random(dev);
 
-	err = register_netdevice(dev);
-	if (err)
-		return err;
-
-	return 0;
+	return register_netdevice(dev);
 }
 
 static int team_validate(struct nlattr *tb[], struct nlattr *data[])

-- 
1.8.1.2

Tue, Aug 05, 2014 at 08:58:50AM CEST, makita.toshiaki@lab.ntt.co.jp wrote:

The variable "err" is not necessary.
Return register_netdevice() directly.

Signed-off-by: Toshiaki Makita <redacted>

Acked-by: Jiri Pirko <jiri@resnulli.us>

From: Toshiaki Makita <redacted>
Date: Tue,  5 Aug 2014 15:58:50 +0900

The variable "err" is not necessary.
Return register_netdevice() directly.

Signed-off-by: Toshiaki Makita <redacted>

Applied, thanks.