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 d95b114808656246e709dc987f55fc2ea8776df6..5a50ea75094fc411a36c6cd13b1b602cd420bcc3 100644 (file)
--- 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();