From ff204cce75d75678bf75fdd48c4c89fa30c555d3 Mon Sep 17 00:00:00 2001 From: Toshiaki Makita Date: Tue, 5 Aug 2014 15:58:50 +0900 Subject: [PATCH] team: Simplify return path of team_newlink The variable "err" is not necessary. Return register_netdevice() directly. Signed-off-by: Toshiaki Makita Acked-by: Jiri Pirko Signed-off-by: David S. Miller --- 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[]) -- 2.7.4