From: Jean Sacren <sakiwit@gmail.com>
Date: Wed, 6 Oct 2021 00:41:20 -0600
Subject: net: tg3: fix obsolete check of !err
Patch-mainline: v5.16-rc1
Git-commit: fe5d8bd3d3ea7422b8ae8f1863ac2ab06998947a
References: jsc#PED-1492
The err variable is checked for true or false a few lines above. When
!err is checked again, it always evaluates to true. Therefore we should
skip this check.
We should also group the adjacent statements together for readability.
Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/broadcom/tg3.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -11213,12 +11213,8 @@ static void tg3_reset_task(struct work_s
}
tg3_netif_start(tp);
-
tg3_full_unlock(tp);
-
- if (!err)
- tg3_phy_start(tp);
-
+ tg3_phy_start(tp);
tg3_flag_clear(tp, RESET_TASK_PENDING);
out:
rtnl_unlock();