From: Bruce Allan <bruce.w.allan@intel.com>
Date: Wed, 8 Feb 2012 02:55:30 +0000 (+0000)
Subject: e1000e: cleanup: remove unnecessary test and return
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~319
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ee470eaa43df1ebf6ab67ca0b07c20ac35e7b09c;p=users%2Fjedix%2Flinux-maple.git

e1000e: cleanup: remove unnecessary test and return

Fall-through to a return statement that effectively does the same.

(cherry picked from commit f764956fd6c93be36cc60726ffd101d59fc3f581)
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index a8b99bae0222..0e86c7e761ea 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -1264,8 +1264,6 @@ s32 e1000e_phy_force_speed_duplex_igp(struct e1000_hw *hw)
 						     PHY_FORCE_LIMIT,
 						     100000,
 						     &link);
-		if (ret_val)
-			return ret_val;
 	}
 
 	return ret_val;