OSDN Git Service

r8169: enable WoL speed down on more chip versions
authorHeiner Kallweit <hkallweit1@gmail.com>
Wed, 29 May 2019 18:52:03 +0000 (20:52 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 May 2019 21:37:30 +0000 (14:37 -0700)
Call the pll power down function also for chip versions 02..06 and
13..15. The MAC can't be powered down on these chip versions, but at
least they benefit from the speed-down power-saving if WoL is enabled.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index 261858e..1f98e45 100644 (file)
@@ -4105,7 +4105,7 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp)
        }
 }
 
-static void r8168_pll_power_down(struct rtl8169_private *tp)
+static void rtl_pll_power_down(struct rtl8169_private *tp)
 {
        if (r8168_check_dash(tp))
                return;
@@ -4145,7 +4145,7 @@ static void r8168_pll_power_down(struct rtl8169_private *tp)
        }
 }
 
-static void r8168_pll_power_up(struct rtl8169_private *tp)
+static void rtl_pll_power_up(struct rtl8169_private *tp)
 {
        switch (tp->mac_version) {
        case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_33:
@@ -4178,28 +4178,6 @@ static void r8168_pll_power_up(struct rtl8169_private *tp)
        msleep(20);
 }
 
-static void rtl_pll_power_down(struct rtl8169_private *tp)
-{
-       switch (tp->mac_version) {
-       case RTL_GIGA_MAC_VER_02 ... RTL_GIGA_MAC_VER_06:
-       case RTL_GIGA_MAC_VER_13 ... RTL_GIGA_MAC_VER_15:
-               break;
-       default:
-               r8168_pll_power_down(tp);
-       }
-}
-
-static void rtl_pll_power_up(struct rtl8169_private *tp)
-{
-       switch (tp->mac_version) {
-       case RTL_GIGA_MAC_VER_02 ... RTL_GIGA_MAC_VER_06:
-       case RTL_GIGA_MAC_VER_13 ... RTL_GIGA_MAC_VER_15:
-               break;
-       default:
-               r8168_pll_power_up(tp);
-       }
-}
-
 static void rtl_init_rxcfg(struct rtl8169_private *tp)
 {
        switch (tp->mac_version) {