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>
This commit is contained in:
@@ -470,9 +470,8 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
|
||||
ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
|
||||
|
||||
if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
|
||||
ret_val = -E1000_ERR_PHY;
|
||||
e1000_release_phy_80003es2lan(hw);
|
||||
return ret_val;
|
||||
return -E1000_ERR_PHY;
|
||||
}
|
||||
|
||||
udelay(200);
|
||||
@@ -804,9 +803,7 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
|
||||
ew32(IMC, 0xffffffff);
|
||||
er32(ICR);
|
||||
|
||||
ret_val = e1000_check_alt_mac_addr_generic(hw);
|
||||
|
||||
return ret_val;
|
||||
return e1000_check_alt_mac_addr_generic(hw);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1265,9 +1262,8 @@ static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
|
||||
} while ((reg_data != reg_data2) && (i < GG82563_MAX_KMRN_RETRY));
|
||||
|
||||
reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
|
||||
ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
|
||||
|
||||
return ret_val;
|
||||
return e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
|
||||
}
|
||||
|
||||
/**
|
||||
|
مرجع در شماره جدید
Block a user