summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/intel/e1000e/phy.c
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2012-02-08 06:55:03 +0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-02-14 00:28:44 +0400
commit7eb61d81946ccb61726600c6e8ceefcce9844f02 (patch)
treed9c8dbd1346490a74b57b6e52201b66f7665c866 /drivers/net/ethernet/intel/e1000e/phy.c
parent8649f4319656f9fcaa59726799a824254b0a1bce (diff)
downloadlinux-7eb61d81946ccb61726600c6e8ceefcce9844f02.tar.xz
e1000e: cleanup: remove unnecessary assignments just before returning
Just return the appropriate value. 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 'drivers/net/ethernet/intel/e1000e/phy.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/phy.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 70e8eb6d49d8..323cb145f849 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -1064,8 +1064,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
break;
default:
e_dbg("Flow control param set incorrectly\n");
- ret_val = -E1000_ERR_CONFIG;
- return ret_val;
+ return -E1000_ERR_CONFIG;
}
ret_val = e1e_wphy(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);