r8169: move rtl_wol_enable_rx() and rtl_prepare_power_down()

[ Upstream commit ad425666a1f05d9b215a84cf010c3789b2ea8206 ]

There is no functional change. Moving these two functions for following
patch "r8169: fix dmar pte write access is not set error".

Signed-off-by: Chunhao Lin <hau@realtek.com>
Reviewed-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index fe8dc8e..316c925 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -2207,28 +2207,6 @@ static int rtl_set_mac_address(struct net_device *dev, void *p)
        return 0;
 }
 
-static void rtl_wol_enable_rx(struct rtl8169_private *tp)
-{
-       if (tp->mac_version >= RTL_GIGA_MAC_VER_25)
-               RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig) |
-                       AcceptBroadcast | AcceptMulticast | AcceptMyPhys);
-}
-
-static void rtl_prepare_power_down(struct rtl8169_private *tp)
-{
-       if (tp->dash_type != RTL_DASH_NONE)
-               return;
-
-       if (tp->mac_version == RTL_GIGA_MAC_VER_32 ||
-           tp->mac_version == RTL_GIGA_MAC_VER_33)
-               rtl_ephy_write(tp, 0x19, 0xff64);
-
-       if (device_may_wakeup(tp_to_dev(tp))) {
-               phy_speed_down(tp->phydev, false);
-               rtl_wol_enable_rx(tp);
-       }
-}
-
 static void rtl_init_rxcfg(struct rtl8169_private *tp)
 {
        switch (tp->mac_version) {
@@ -2452,6 +2430,28 @@ static void rtl_enable_rxdvgate(struct rtl8169_private *tp)
        rtl_wait_txrx_fifo_empty(tp);
 }
 
+static void rtl_wol_enable_rx(struct rtl8169_private *tp)
+{
+       if (tp->mac_version >= RTL_GIGA_MAC_VER_25)
+               RTL_W32(tp, RxConfig, RTL_R32(tp, RxConfig) |
+                       AcceptBroadcast | AcceptMulticast | AcceptMyPhys);
+}
+
+static void rtl_prepare_power_down(struct rtl8169_private *tp)
+{
+       if (tp->dash_type != RTL_DASH_NONE)
+               return;
+
+       if (tp->mac_version == RTL_GIGA_MAC_VER_32 ||
+           tp->mac_version == RTL_GIGA_MAC_VER_33)
+               rtl_ephy_write(tp, 0x19, 0xff64);
+
+       if (device_may_wakeup(tp_to_dev(tp))) {
+               phy_speed_down(tp->phydev, false);
+               rtl_wol_enable_rx(tp);
+       }
+}
+
 static void rtl_set_tx_config_registers(struct rtl8169_private *tp)
 {
        u32 val = TX_DMA_BURST << TxDMAShift |