diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2018-04-28 22:19:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-30 15:38:19 +0200 |
| commit | 3559d81e76bfe3803e89f2e04cf6ef7ab4f3aace (patch) | |
| tree | bbbd15e7bafa0840dee0a66831ac53ba74da5649 /drivers/net/ethernet/realtek | |
| parent | r8169: improve handling of CPCMD quirk mask (diff) | |
| download | linux-3559d81e76bfe3803e89f2e04cf6ef7ab4f3aace.tar.xz linux-3559d81e76bfe3803e89f2e04cf6ef7ab4f3aace.zip | |
r8169: simplify rtl_hw_start_8169
Currently done:
- if mac_version in (01, 02, 03, 04)
RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);
- if mac_version in (01, 02, 03, 04)
rtl_set_rx_tx_config_registers(tp);
- if mac_version not in (01, 02, 03, 04)
RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);
rtl_set_rx_tx_config_registers(tp);
So we do exactly the same independent of chip version and can simplify
the code.
In addition remove the call to rtl_init_rxcfg(), it's called in
rtl_init_one() already and the set bits are never touched later.
rtl_init_8168/8101 don't include this call either.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index cf7a7db53791..8c816f6c6fc5 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -5409,24 +5409,11 @@ static void rtl_hw_start_8169(struct rtl8169_private *tp) pci_write_config_byte(tp->pci_dev, PCI_CACHE_LINE_SIZE, 0x08); RTL_W8(tp, Cfg9346, Cfg9346_Unlock); - if (tp->mac_version == RTL_GIGA_MAC_VER_01 || - tp->mac_version == RTL_GIGA_MAC_VER_02 || - tp->mac_version == RTL_GIGA_MAC_VER_03 || - tp->mac_version == RTL_GIGA_MAC_VER_04) - RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb); - - rtl_init_rxcfg(tp); RTL_W8(tp, EarlyTxThres, NoEarlyTx); rtl_set_rx_max_size(tp); - if (tp->mac_version == RTL_GIGA_MAC_VER_01 || - tp->mac_version == RTL_GIGA_MAC_VER_02 || - tp->mac_version == RTL_GIGA_MAC_VER_03 || - tp->mac_version == RTL_GIGA_MAC_VER_04) - rtl_set_rx_tx_config_registers(tp); - tp->cp_cmd |= PCIMulRW; if (tp->mac_version == RTL_GIGA_MAC_VER_02 || @@ -5447,14 +5434,9 @@ static void rtl_hw_start_8169(struct rtl8169_private *tp) RTL_W16(tp, IntrMitigate, 0x0000); rtl_set_rx_tx_desc_registers(tp); + rtl_set_rx_tx_config_registers(tp); - if (tp->mac_version != RTL_GIGA_MAC_VER_01 && - tp->mac_version != RTL_GIGA_MAC_VER_02 && - tp->mac_version != RTL_GIGA_MAC_VER_03 && - tp->mac_version != RTL_GIGA_MAC_VER_04) { - RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb); - rtl_set_rx_tx_config_registers(tp); - } + RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb); RTL_W8(tp, Cfg9346, Cfg9346_Lock); |