igc: Remove useless forward declaration
Subsystems (2)
PATCH 1/1 igc: Remove useless forward declaration
Move igc_phy_setup_autoneg,igc_wait_autoneg and igc_set_fc_watermarks up to avoid forward declaration.
It is not necessary to forward declare these static methods.
Signed-off-by Sasha Neftin <[email protected]>
--- drivers/net/ethernet/intel/igc/igc_mac.c | 73 ++++++------ drivers/net/ethernet/intel/igc/igc_phy.c | 192 +++++++++++++++---------------- 2 files changed, 129 insertions(+), 136 deletions(-)
drivers/net/ethernet/intel/igc/igc_mac.c +35 -38
@@ -7,9 +7,6 @@#include "igc_mac.h" #include "igc_hw.h" -/* forward declaration */ -static s32 igc_set_fc_watermarks (struct igc_hw *hw); -/** * igc_disable_pcie_master - Disables PCI-express master access * @hw: pointer to the HW structure
@@ -75,6 +72,41 @@ void igc_init_rx_addrs(struct igc_hw *hw, u16 rar_count) }/** +* igc_set_fc_watermarks - Set flow control high/low watermarks +* @hw: pointer to the HW structure +* +* Sets the flow control high/low threshold (watermark) registers. If +* flow control XON frame transmission is enabled, then set XON frame +* transmission as well. +*/ +static s32 igc_set_fc_watermarks (struct igc_hw *hw) +{ +u32 fcrtl =0 , fcrth =0 ; + +/* Set the flow control receive threshold registers. Normally, +* these registers will be set to a default threshold that may be +* adjusted later by the driver's runtime code. However, if the +* ability to transmit pause frames is not enabled, then these +* registers will be set to 0. +*/ +if (hw->fc.current_mode & igc_fc_tx_pause) { +/* We need to set up the Receive Threshold high and low water +* marks as well as (optionally) enabling the transmission of +* XON frames. +*/ + fcrtl = hw->fc.low_water; +if (hw->fc.send_xon) + fcrtl |=IGC_FCRTL_XONE ; + + fcrth = hw->fc.high_water; + } +wr32 (IGC_FCRTL , fcrtl); +wr32 (IGC_FCRTH , fcrth); + +return 0 ; +} + +/** * igc_setup_link - Setup flow control and link settings * @hw: pointer to the HW structure *
@@ -195,41 +227,6 @@ s32 igc_force_mac_fc(struct igc_hw *hw) }/** -* igc_set_fc_watermarks - Set flow control high/low watermarks -* @hw: pointer to the HW structure -* -* Sets the flow control high/low threshold (watermark) registers. If -* flow control XON frame transmission is enabled, then set XON frame -* transmission as well. -*/ -static s32 igc_set_fc_watermarks (struct igc_hw *hw) -{ -u32 fcrtl =0 , fcrth =0 ; - -/* Set the flow control receive threshold registers. Normally, -* these registers will be set to a default threshold that may be -* adjusted later by the driver's runtime code. However, if the -* ability to transmit pause frames is not enabled, then these -* registers will be set to 0. -*/ -if (hw->fc.current_mode & igc_fc_tx_pause) { -/* We need to set up the Receive Threshold high and low water -* marks as well as (optionally) enabling the transmission of -* XON frames. -*/ - fcrtl = hw->fc.low_water; -if (hw->fc.send_xon) - fcrtl |=IGC_FCRTL_XONE ; - - fcrth = hw->fc.high_water; - } -wr32 (IGC_FCRTL , fcrtl); -wr32 (IGC_FCRTH , fcrth); - -return 0 ; -} - -/** * igc_clear_hw_cntrs_base - Clear base hardware counters * @hw: pointer to the HW structure *
drivers/net/ethernet/intel/igc/igc_phy.c +94 -98
210 lines not on this page · raw message
Signature · 1 line
2.11.0
Brown
PATCH 1/1 igc: Remove useless forward declaration
Quoted 12 lines
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Sasha Neftin
Sent: Tuesday, July 16, 2019 5:36 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH v1] igc: Remove useless forward declarationMove igc_phy_setup_autoneg,igc_wait_autoneg and
igc_set_fc_watermarks
up to avoid forward declaration.
It is not necessary to forward declare these static methods.
Quoted 6 lines
Signed-off-by Sasha Neftin <[email protected]>--- drivers/net/ethernet/intel/igc/igc_mac.c | 73 ++++++------ drivers/net/ethernet/intel/igc/igc_phy.c | 192 +++++++++++++++------------ ---- 2 files changed, 129 insertions(+), 136 deletions(-)
Tested-by Aaron Brown <[email protected]>