From c6b6a8f3eb347813aabd48c7888e144853a517a0 Mon Sep 17 00:00:00 2001 From: Jim Ma Date: Wed, 16 Nov 2022 13:25:14 +0000 Subject: [PATCH] igc: Remove _I_PHY_ID checking backport from https://github.com/torvalds/linux/commit/7c496de538eebd8212dc2a3c9a468386b264d0d4 Signed-off-by: Jim Ma --- igc_base.c | 10 +--------- igc_main.c | 3 +-- igc_phy.c | 6 ++---- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/igc_base.c b/igc_base.c index e1be963..9f4f3a7 100644 --- a/igc_base.c +++ b/igc_base.c @@ -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; diff --git a/igc_main.c b/igc_main.c index b78200d..748f0fa 100644 --- a/igc_main.c +++ b/igc_main.c @@ -4147,8 +4147,7 @@ bool igc_has_link(struct igc_adapter *adapter) hw->mac.ops.check_for_link(hw); link_active = !hw->mac.get_link_status; - 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)) { diff --git a/igc_phy.c b/igc_phy.c index 3fecd50..14fe41e 100644 --- a/igc_phy.c +++ b/igc_phy.c @@ -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) |