diff options
author | YueHaibing <yuehaibing@huawei.com> | 2018-10-19 08:40:30 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2018-11-07 12:47:01 -0500 |
commit | dda458d28567d0bb99ad67180a72aaff2e0adc3b (patch) | |
tree | 98710688df7d05efdf7e3b9d5a29f4606c9cdcd5 /drivers/net/ethernet/intel/igc/igc_base.c | |
parent | 540a152da762a2360e0dac18e2eafff2775c4670 (diff) |
igc: Remove set but not used variables 'ctrl_ext, link_mode'
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/net/ethernet/intel/igc/igc_base.c: In function 'igc_init_phy_params_base':
drivers/net/ethernet/intel/igc/igc_base.c:240:6: warning:
variable 'ctrl_ext' set but not used [-Wunused-but-set-variable]
u32 ctrl_ext;
drivers/net/ethernet/intel/igc/igc_base.c: In function 'igc_get_invariants_base':
drivers/net/ethernet/intel/igc/igc_base.c:290:6: warning:
variable 'link_mode' set but not used [-Wunused-but-set-variable]
u32 link_mode = 0;
It never used since introduction in
commit c0071c7aa5fe ("igc: Add HW initialization code")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-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 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc_base.c b/drivers/net/ethernet/intel/igc/igc_base.c index 832da609d9a7..df40af759542 100644 --- a/drivers/net/ethernet/intel/igc/igc_base.c +++ b/drivers/net/ethernet/intel/igc/igc_base.c | |||
@@ -237,7 +237,6 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw) | |||
237 | { | 237 | { |
238 | struct igc_phy_info *phy = &hw->phy; | 238 | struct igc_phy_info *phy = &hw->phy; |
239 | s32 ret_val = 0; | 239 | s32 ret_val = 0; |
240 | u32 ctrl_ext; | ||
241 | 240 | ||
242 | if (hw->phy.media_type != igc_media_type_copper) { | 241 | if (hw->phy.media_type != igc_media_type_copper) { |
243 | phy->type = igc_phy_none; | 242 | phy->type = igc_phy_none; |
@@ -247,8 +246,6 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw) | |||
247 | phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT_2500; | 246 | phy->autoneg_mask = AUTONEG_ADVERTISE_SPEED_DEFAULT_2500; |
248 | phy->reset_delay_us = 100; | 247 | phy->reset_delay_us = 100; |
249 | 248 | ||
250 | ctrl_ext = rd32(IGC_CTRL_EXT); | ||
251 | |||
252 | /* set lan id */ | 249 | /* set lan id */ |
253 | hw->bus.func = (rd32(IGC_STATUS) & IGC_STATUS_FUNC_MASK) >> | 250 | hw->bus.func = (rd32(IGC_STATUS) & IGC_STATUS_FUNC_MASK) >> |
254 | IGC_STATUS_FUNC_SHIFT; | 251 | IGC_STATUS_FUNC_SHIFT; |
@@ -287,8 +284,6 @@ out: | |||
287 | static s32 igc_get_invariants_base(struct igc_hw *hw) | 284 | static s32 igc_get_invariants_base(struct igc_hw *hw) |
288 | { | 285 | { |
289 | struct igc_mac_info *mac = &hw->mac; | 286 | struct igc_mac_info *mac = &hw->mac; |
290 | u32 link_mode = 0; | ||
291 | u32 ctrl_ext = 0; | ||
292 | s32 ret_val = 0; | 287 | s32 ret_val = 0; |
293 | 288 | ||
294 | switch (hw->device_id) { | 289 | switch (hw->device_id) { |
@@ -302,9 +297,6 @@ static s32 igc_get_invariants_base(struct igc_hw *hw) | |||
302 | 297 | ||
303 | hw->phy.media_type = igc_media_type_copper; | 298 | hw->phy.media_type = igc_media_type_copper; |
304 | 299 | ||
305 | ctrl_ext = rd32(IGC_CTRL_EXT); | ||
306 | link_mode = ctrl_ext & IGC_CTRL_EXT_LINK_MODE_MASK; | ||
307 | |||
308 | /* mac initialization and operations */ | 300 | /* mac initialization and operations */ |
309 | ret_val = igc_init_mac_params_base(hw); | 301 | ret_val = igc_init_mac_params_base(hw); |
310 | if (ret_val) | 302 | if (ret_val) |