diff options
author | Sasha Neftin <sasha.neftin@intel.com> | 2019-01-15 08:21:18 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2019-02-05 20:23:09 -0500 |
commit | 200a1a1a7e91eee978c76238f6ef526e3071a81c (patch) | |
tree | 7a5c4eb114edf5e0ff6862467b84529b075fe206 /drivers/net/ethernet/intel/igc/igc_base.c | |
parent | 109f599663b9d24f0045b1f4f576896c136942ec (diff) |
igc: Remove the 'igc_get_phy_id_base' method
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>
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc_base.c')
-rw-r--r-- | drivers/net/ethernet/intel/igc/igc_base.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc_base.c b/drivers/net/ethernet/intel/igc/igc_base.c index 51a667c16dea..fe9a9666c70f 100644 --- a/drivers/net/ethernet/intel/igc/igc_base.c +++ b/drivers/net/ethernet/intel/igc/igc_base.c | |||
@@ -108,22 +108,6 @@ static s32 igc_reset_hw_base(struct igc_hw *hw) | |||
108 | } | 108 | } |
109 | 109 | ||
110 | /** | 110 | /** |
111 | * igc_get_phy_id_base - Retrieve PHY addr and id | ||
112 | * @hw: pointer to the HW structure | ||
113 | * | ||
114 | * Retrieves the PHY address and ID for both PHY's which do and do not use | ||
115 | * sgmi interface. | ||
116 | */ | ||
117 | static s32 igc_get_phy_id_base(struct igc_hw *hw) | ||
118 | { | ||
119 | s32 ret_val = 0; | ||
120 | |||
121 | ret_val = igc_get_phy_id(hw); | ||
122 | |||
123 | return ret_val; | ||
124 | } | ||
125 | |||
126 | /** | ||
127 | * igc_init_nvm_params_base - Init NVM func ptrs. | 111 | * igc_init_nvm_params_base - Init NVM func ptrs. |
128 | * @hw: pointer to the HW structure | 112 | * @hw: pointer to the HW structure |
129 | */ | 113 | */ |
@@ -245,7 +229,7 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw) | |||
245 | goto out; | 229 | goto out; |
246 | } | 230 | } |
247 | 231 | ||
248 | ret_val = igc_get_phy_id_base(hw); | 232 | ret_val = igc_get_phy_id(hw); |
249 | if (ret_val) | 233 | if (ret_val) |
250 | return ret_val; | 234 | return ret_val; |
251 | 235 | ||