diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2018-05-02 21:39:35 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-05-02 16:23:49 -0400 |
| commit | 6851d025e514089bf8d2ea80048d0c928f4bbf02 (patch) | |
| tree | c19f4eb199524faca26315d86f42ca52c2e1a072 /drivers/net | |
| parent | Merge branch 'net-smc-small-features' (diff) | |
| download | linux-dev-6851d025e514089bf8d2ea80048d0c928f4bbf02.tar.xz linux-dev-6851d025e514089bf8d2ea80048d0c928f4bbf02.zip | |
r8169: remove unneeded check in r8168_pll_power_down
RTL_GIGA_MAC_VER_23/24 are configured by rtl_hw_start_8168cp_2()
and rtl_hw_start_8168cp_3() respectively which both apply
CPCMD_QUIRK_MASK, thus clearing bit ASF.
Bit ASF isn't set at any other place in the driver, therefore this
check can be removed.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 66f10d119b12..ce7843aab81d 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4838,12 +4838,6 @@ static void r8168_pll_power_down(struct rtl8169_private *tp) if (r8168_check_dash(tp)) return; - if ((tp->mac_version == RTL_GIGA_MAC_VER_23 || - tp->mac_version == RTL_GIGA_MAC_VER_24) && - (tp->cp_cmd & ASF)) { - return; - } - if (tp->mac_version == RTL_GIGA_MAC_VER_32 || tp->mac_version == RTL_GIGA_MAC_VER_33) rtl_ephy_write(tp, 0x19, 0xff64); |