Commit 7c496de5 authored by Sasha Neftin's avatar Sasha Neftin Committed by Tony Nguyen

igc: Remove _I_PHY_ID checking

i225 devices have only one PHY vendor. There is no point checking
_I_PHY_ID during the link establishment and auto-negotiation process.
This patch comes to clean up these pointless checkings.
Signed-off-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Tested-by: default avatarDvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 373e2829
...@@ -187,15 +187,7 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw) ...@@ -187,15 +187,7 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw)
igc_check_for_copper_link(hw); igc_check_for_copper_link(hw);
/* Verify phy id and set remaining function pointers */
switch (phy->id) {
case I225_I_PHY_ID:
phy->type = igc_phy_i225; phy->type = igc_phy_i225;
break;
default:
ret_val = -IGC_ERR_PHY;
goto out;
}
out: out:
return ret_val; return ret_val;
......
...@@ -5231,8 +5231,7 @@ bool igc_has_link(struct igc_adapter *adapter) ...@@ -5231,8 +5231,7 @@ bool igc_has_link(struct igc_adapter *adapter)
break; break;
} }
if (hw->mac.type == igc_i225 && if (hw->mac.type == igc_i225) {
hw->phy.id == I225_I_PHY_ID) {
if (!netif_carrier_ok(adapter->netdev)) { if (!netif_carrier_ok(adapter->netdev)) {
adapter->flags &= ~IGC_FLAG_NEED_LINK_UPDATE; adapter->flags &= ~IGC_FLAG_NEED_LINK_UPDATE;
} else if (!(adapter->flags & IGC_FLAG_NEED_LINK_UPDATE)) { } else if (!(adapter->flags & IGC_FLAG_NEED_LINK_UPDATE)) {
......
...@@ -249,8 +249,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw) ...@@ -249,8 +249,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw)
return ret_val; return ret_val;
} }
if ((phy->autoneg_mask & ADVERTISE_2500_FULL) && if (phy->autoneg_mask & ADVERTISE_2500_FULL) {
hw->phy.id == I225_I_PHY_ID) {
/* Read the MULTI GBT AN Control Register - reg 7.32 */ /* Read the MULTI GBT AN Control Register - reg 7.32 */
ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK << ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK <<
MMD_DEVADDR_SHIFT) | MMD_DEVADDR_SHIFT) |
...@@ -390,8 +389,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw) ...@@ -390,8 +389,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw)
ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL, ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL,
mii_1000t_ctrl_reg); mii_1000t_ctrl_reg);
if ((phy->autoneg_mask & ADVERTISE_2500_FULL) && if (phy->autoneg_mask & ADVERTISE_2500_FULL)
hw->phy.id == I225_I_PHY_ID)
ret_val = phy->ops.write_reg(hw, ret_val = phy->ops.write_reg(hw,
(STANDARD_AN_REG_MASK << (STANDARD_AN_REG_MASK <<
MMD_DEVADDR_SHIFT) | MMD_DEVADDR_SHIFT) |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment