igc: Fix code redundancy
Subsystems (2)
PATCH 1/1 igc: Fix code redundancy
Remove redundant igc_check_for_link_base code and replace it with an igc_check_for_copper_link method.
Fix duplication of IGC_ADVTXD_PAYLEN_SHIFT mask declaration. Remove obsolete IGC_SCVPC register definition.
Signed-off-by Sasha Neftin <[email protected]>
--- drivers/net/ethernet/intel/igc/igc_base.c | 20 ++------------------ drivers/net/ethernet/intel/igc/igc_base.h | 3 --- drivers/net/ethernet/intel/igc/igc_regs.h | 1 - 3 files changed, 2 insertions(+), 22 deletions(-)
drivers/net/ethernet/intel/igc/igc_base.c +2 -18
@@ -54,22 +54,6 @@ static s32 igc_set_pcie_completion_timeout(struct igc_hw *hw) }/** -* igc_check_for_link_base - Check for link -* @hw: pointer to the HW structure -* -* If sgmii is enabled, then use the pcs register to determine link, otherwise -* use the generic interface for determining link. -*/ -static s32 igc_check_for_link_base (struct igc_hw *hw) -{ -s32 ret_val =0 ; - - ret_val =igc_check_for_copper_link (hw); - -return ret_val; -} - -/** * igc_reset_hw_base - Reset hardware * @hw: pointer to the HW structure *
@@ -265,7 +249,7 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw)if (ret_val)return ret_val; -igc_check_for_link_base (hw); +igc_check_for_copper_link (hw);/* Verify phy id and set remaining function pointers */ switch (phy->id) {
@@ -512,7 +496,7 @@ void igc_rx_fifo_flush_base(struct igc_hw *hw)static struct igc_mac_operations igc_mac_ops_base = { .init_hw = igc_init_hw_base, - .check_for_link = igc_check_for_link_base, + .check_for_link = igc_check_for_copper_link, .rar_set = igc_rar_set, .read_mac_addr = igc_read_mac_addr_base, .get_speed_and_duplex = igc_get_link_up_info_base,
drivers/net/ethernet/intel/igc/igc_base.h +0 -3
@@ -90,9 +90,6 @@ union igc_adv_rx_desc { } wb;/* writeback */ }; -/* Adv Transmit Descriptor Config Masks */ -#define IGC_ADVTXD_PAYLEN_SHIFT 14/* Adv desc PAYLEN shift */ -/* Additional Transmit Descriptor Control definitions */ #define IGC_TXDCTL_QUEUE_ENABLE 0x02000000/* Ena specific Tx Queue */
drivers/net/ethernet/intel/igc/igc_regs.h +0 -1
@@ -188,7 +188,6 @@#define IGC_HGOTCL 0x04130/* Host Good Octets Transmit Count Low */ #define IGC_HGOTCH 0x04134/* Host Good Octets Transmit Count High */ #define IGC_LENERRS 0x04138/* Length Errors Count */ -#define IGC_SCVPC 0x04228/* SerDes/SGMII Code Violation Pkt Count */ #define IGC_HRMPC 0x0A018/* Header Redirection Missed Packet Count */ /* Management registers */
Signature · 1 line
2.11.0
Brown
PATCH 1/1 igc: Fix code redundancy
Quoted 11 lines
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Sasha Neftin
Sent: Tuesday, December 18, 2018 1:30 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH 1/1] igc: Fix code redundancyRemove redundant
igc_check_for_link_basecode and replace it with anigc_check_for_copper_linkmethod.
Fix duplication ofIGC_ADVTXD_PAYLEN_SHIFTmask declaration. Remove obsoleteIGC_SCVPCregister definition.
Quoted 7 lines
Signed-off-by Sasha Neftin <[email protected]>--- drivers/net/ethernet/intel/igc/igc_base.c | 20 ++------------------ drivers/net/ethernet/intel/igc/igc_base.h | 3 --- drivers/net/ethernet/intel/igc/igc_regs.h | 1 - 3 files changed, 2 insertions(+), 22 deletions(-)
Tested-by Aaron Brown <[email protected]>