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 <sasha.neftin@intel.com>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/igc/igc_base.c b/drivers/net/ethernet/intel/igc/igc_base.c
index d0700d48ecf9ba095ae5d0e0af4abf66f73089b7..84f142f5e472e599f14b54b86756dca32b4b0a4f 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_base.c
+++ b/drivers/net/ethernet/intel/igc/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/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index f7cf97916390600131e4ca1f160c581746cb2995..a5278a8f491fb7865ed656f7c25f8f92a2bbff43 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -5231,8 +5231,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)) {

diff --git a/drivers/net/ethernet/intel/igc/igc_phy.c b/drivers/net/ethernet/intel/igc/igc_phy.c
index 83aeb5e7076fdf37b968100fb76ef1c4c8741d2f..5cad31c3c7b09454da34129ddf51a51808c0e389 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_phy.c
+++ b/drivers/net/ethernet/intel/igc/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) |