summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/phy.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2012-02-08 03:55:30 +0100
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-02-13 22:20:00 +0100
commitf764956fd6c93be36cc60726ffd101d59fc3f581 (patch)
tree98394868135f5b0cfdd60270355f5efc4a813f28 /drivers/net/ethernet/intel/e1000e/phy.c
parente1000e: cleanup: remove unnecessary variable ret_val (diff)
downloadlinux-f764956fd6c93be36cc60726ffd101d59fc3f581.tar.xz
linux-f764956fd6c93be36cc60726ffd101d59fc3f581.zip
e1000e: cleanup: remove unnecessary test and return
Fall-through to a return statement that effectively does the same. 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>
Diffstat (limited to '')
-rw-r--r--drivers/net/ethernet/intel/e1000e/phy.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index a8b99bae0222..0e86c7e761ea 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/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;