r8169: remove 810x_phy_power_up/down

The functionality of 810x_phy_power_up/down is covered by the default
clause in 8168_phy_power_up/down. Therefore we don't need these
functions.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index ce7843a..58559a0 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -4718,61 +4718,6 @@ static bool rtl_wol_pll_power_down(struct rtl8169_private *tp)
        return true;
 }
 
-static void r810x_phy_power_down(struct rtl8169_private *tp)
-{
-       rtl_writephy(tp, 0x1f, 0x0000);
-       rtl_writephy(tp, MII_BMCR, BMCR_PDOWN);
-}
-
-static void r810x_phy_power_up(struct rtl8169_private *tp)
-{
-       rtl_writephy(tp, 0x1f, 0x0000);
-       rtl_writephy(tp, MII_BMCR, BMCR_ANENABLE);
-}
-
-static void r810x_pll_power_down(struct rtl8169_private *tp)
-{
-       if (rtl_wol_pll_power_down(tp))
-               return;
-
-       r810x_phy_power_down(tp);
-
-       switch (tp->mac_version) {
-       case RTL_GIGA_MAC_VER_07:
-       case RTL_GIGA_MAC_VER_08:
-       case RTL_GIGA_MAC_VER_09:
-       case RTL_GIGA_MAC_VER_10:
-       case RTL_GIGA_MAC_VER_13:
-       case RTL_GIGA_MAC_VER_16:
-               break;
-       default:
-               RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) & ~0x80);
-               break;
-       }
-}
-
-static void r810x_pll_power_up(struct rtl8169_private *tp)
-{
-       r810x_phy_power_up(tp);
-
-       switch (tp->mac_version) {
-       case RTL_GIGA_MAC_VER_07:
-       case RTL_GIGA_MAC_VER_08:
-       case RTL_GIGA_MAC_VER_09:
-       case RTL_GIGA_MAC_VER_10:
-       case RTL_GIGA_MAC_VER_13:
-       case RTL_GIGA_MAC_VER_16:
-               break;
-       case RTL_GIGA_MAC_VER_47:
-       case RTL_GIGA_MAC_VER_48:
-               RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) | 0xc0);
-               break;
-       default:
-               RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) | 0x80);
-               break;
-       }
-}
-
 static void r8168_phy_power_up(struct rtl8169_private *tp)
 {
        rtl_writephy(tp, 0x1f, 0x0000);
@@ -4833,6 +4778,49 @@ static void r8168_phy_power_down(struct rtl8169_private *tp)
        }
 }
 
+static void r810x_pll_power_down(struct rtl8169_private *tp)
+{
+       if (rtl_wol_pll_power_down(tp))
+               return;
+
+       r8168_phy_power_down(tp);
+
+       switch (tp->mac_version) {
+       case RTL_GIGA_MAC_VER_07:
+       case RTL_GIGA_MAC_VER_08:
+       case RTL_GIGA_MAC_VER_09:
+       case RTL_GIGA_MAC_VER_10:
+       case RTL_GIGA_MAC_VER_13:
+       case RTL_GIGA_MAC_VER_16:
+               break;
+       default:
+               RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) & ~0x80);
+               break;
+       }
+}
+
+static void r810x_pll_power_up(struct rtl8169_private *tp)
+{
+       r8168_phy_power_up(tp);
+
+       switch (tp->mac_version) {
+       case RTL_GIGA_MAC_VER_07:
+       case RTL_GIGA_MAC_VER_08:
+       case RTL_GIGA_MAC_VER_09:
+       case RTL_GIGA_MAC_VER_10:
+       case RTL_GIGA_MAC_VER_13:
+       case RTL_GIGA_MAC_VER_16:
+               break;
+       case RTL_GIGA_MAC_VER_47:
+       case RTL_GIGA_MAC_VER_48:
+               RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) | 0xc0);
+               break;
+       default:
+               RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) | 0x80);
+               break;
+       }
+}
+
 static void r8168_pll_power_down(struct rtl8169_private *tp)
 {
        if (r8168_check_dash(tp))