mirror of https://gitee.com/openkylin/linux.git
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:
parent
8649f43196
commit
7eb61d8194
|
@ -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);
|
ret_val = e1000e_read_phy_reg_mdic(hw, page_select, &temp);
|
||||||
|
|
||||||
if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
|
if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
|
||||||
ret_val = -E1000_ERR_PHY;
|
|
||||||
e1000_release_phy_80003es2lan(hw);
|
e1000_release_phy_80003es2lan(hw);
|
||||||
return ret_val;
|
return -E1000_ERR_PHY;
|
||||||
}
|
}
|
||||||
|
|
||||||
udelay(200);
|
udelay(200);
|
||||||
|
@ -804,9 +803,7 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
|
||||||
ew32(IMC, 0xffffffff);
|
ew32(IMC, 0xffffffff);
|
||||||
er32(ICR);
|
er32(ICR);
|
||||||
|
|
||||||
ret_val = e1000_check_alt_mac_addr_generic(hw);
|
return e1000_check_alt_mac_addr_generic(hw);
|
||||||
|
|
||||||
return ret_val;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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));
|
} while ((reg_data != reg_data2) && (i < GG82563_MAX_KMRN_RETRY));
|
||||||
|
|
||||||
reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1497,9 +1497,7 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
|
||||||
if (ret_val)
|
if (ret_val)
|
||||||
return ret_val;
|
return ret_val;
|
||||||
|
|
||||||
ret_val = e1000e_setup_copper_link(hw);
|
return e1000e_setup_copper_link(hw);
|
||||||
|
|
||||||
return ret_val;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -458,10 +458,8 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
|
||||||
* If we are forcing speed/duplex, then we simply return since
|
* If we are forcing speed/duplex, then we simply return since
|
||||||
* we have already determined whether we have link or not.
|
* we have already determined whether we have link or not.
|
||||||
*/
|
*/
|
||||||
if (!mac->autoneg) {
|
if (!mac->autoneg)
|
||||||
ret_val = -E1000_ERR_CONFIG;
|
return -E1000_ERR_CONFIG;
|
||||||
return ret_val;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Auto-Neg is enabled. Auto Speed Detection takes care
|
* Auto-Neg is enabled. Auto Speed Detection takes care
|
||||||
|
|
|
@ -1064,8 +1064,7 @@ static s32 e1000_phy_setup_autoneg(struct e1000_hw *hw)
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
e_dbg("Flow control param set incorrectly\n");
|
e_dbg("Flow control param set incorrectly\n");
|
||||||
ret_val = -E1000_ERR_CONFIG;
|
return -E1000_ERR_CONFIG;
|
||||||
return ret_val;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret_val = e1e_wphy(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
|
ret_val = e1e_wphy(hw, PHY_AUTONEG_ADV, mii_autoneg_adv_reg);
|
||||||
|
|
Loading…
Reference in New Issue