OSDN Git Service

igc: Remove the 'igc_get_phy_id_base' method
authorSasha Neftin <sasha.neftin@intel.com>
Tue, 15 Jan 2019 13:21:18 +0000 (15:21 +0200)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 6 Feb 2019 01:23:09 +0000 (17:23 -0800)
Remove the redundant 'igc_get_phy_id_base' method and use
the 'igc_get_phy_id' method directly instead.

Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igc/igc_base.c

index 51a667c..fe9a966 100644 (file)
@@ -108,22 +108,6 @@ static s32 igc_reset_hw_base(struct igc_hw *hw)
 }
 
 /**
- * igc_get_phy_id_base - Retrieve PHY addr and id
- * @hw: pointer to the HW structure
- *
- * Retrieves the PHY address and ID for both PHY's which do and do not use
- * sgmi interface.
- */
-static s32 igc_get_phy_id_base(struct igc_hw *hw)
-{
-       s32  ret_val = 0;
-
-       ret_val = igc_get_phy_id(hw);
-
-       return ret_val;
-}
-
-/**
  * igc_init_nvm_params_base - Init NVM func ptrs.
  * @hw: pointer to the HW structure
  */
@@ -245,7 +229,7 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw)
                goto out;
        }
 
-       ret_val = igc_get_phy_id_base(hw);
+       ret_val = igc_get_phy_id(hw);
        if (ret_val)
                return ret_val;