From: Jean Sacren <sakiwit@gmail.com>
Date: Wed, 6 Oct 2021 06:41:20 +0000 (-0600)
Subject: net: tg3: fix obsolete check of !err
X-Git-Tag: v6.6.17~8953^2~275
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe5d8bd3d3ea7422b8ae8f1863ac2ab06998947a;p=platform%2Fkernel%2Flinux-rpi.git

net: tg3: fix obsolete check of !err

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>
---

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index d95b114..5a50ea7 100644
--- 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_struct *work)
 	}
 
 	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();