igc: Remove _I_PHY_ID checking
Subsystems (2)
PATCH 1/1 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 Sasha Neftin <[email protected]>
--- drivers/net/ethernet/intel/igc/igc_base.c | 10 +--------- drivers/net/ethernet/intel/igc/igc_main.c | 3 +-- drivers/net/ethernet/intel/igc/igc_phy.c | 6 ++---- 3 files changed, 4 insertions(+), 15 deletions(-)
drivers/net/ethernet/intel/igc/igc_base.c +1 -9
@@ -187,15 +187,7 @@ static s32 igc_init_phy_params_base(struct igc_hw *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; -break ; -default : - ret_val = -IGC_ERR_PHY ; - goto out; - } + phy->type = igc_phy_i225; out:return ret_val;
drivers/net/ethernet/intel/igc/igc_main.c +1 -2
@@ -5234,8 +5234,7 @@ bool igc_has_link(struct igc_adapter *adapter)break ; } -if (hw->mac.type == igc_i225 && - hw->phy.id ==I225_I_PHY_ID ) { +if (hw->mac.type == igc_i225) {if (!netif_carrier_ok (adapter->netdev)) { adapter->flags &= ~IGC_FLAG_NEED_LINK_UPDATE ; }else if (!(adapter->flags &IGC_FLAG_NEED_LINK_UPDATE )) {
drivers/net/ethernet/intel/igc/igc_phy.c +2 -4
@@ -249,8 +249,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw)return ret_val; } -if ((phy->autoneg_mask &ADVERTISE_2500_FULL ) && - hw->phy.id ==I225_I_PHY_ID ) { +if (phy->autoneg_mask &ADVERTISE_2500_FULL ) {/* Read the MULTI GBT AN Control Register - reg 7.32 */ ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK << MMD_DEVADDR_SHIFT) |
@@ -390,8 +389,7 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw) ret_val = phy->ops.write_reg (hw,PHY_1000T_CTRL , mii_1000t_ctrl_reg); -if ((phy->autoneg_mask &ADVERTISE_2500_FULL ) && - hw->phy.id ==I225_I_PHY_ID ) +if (phy->autoneg_mask &ADVERTISE_2500_FULL ) ret_val = phy->ops.write_reg(hw, (STANDARD_AN_REG_MASK << MMD_DEVADDR_SHIFT) |
Signature · 1 line
2.25.1
Fuxbrumer
PATCH 1/1 igc: Remove _I_PHY_ID checking
Quoted 11 lines · Sasha Neftin
i225 devices have only one PHY vendor. There is no point checking
_I_PHY_IDduring the link establishment and auto-negotiation process. This patch comes to clean up these pointless checkings.Signed-off-by Sasha Neftin <[email protected]>--- drivers/net/ethernet/intel/igc/igc_base.c | 10 +--------- drivers/net/ethernet/intel/igc/igc_main.c | 3 +-- drivers/net/ethernet/intel/igc/igc_phy.c | 6 ++---- 3 files changed, 4 insertions(+), 15 deletions(-)
Tested-by Dvora Fuxbrumer <[email protected]>