r8169: improve rtl_set_d3_pll_down

Make use of new helper r8169_mod_reg8_cond() and move from a switch()
to an if() clause. Benefit is that we don't have to touch this piece of
code each time support for a new chip version is added.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/e1ccdb85-a4ed-4800-89c2-89770ff06452@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 2ff95fde4489ed30f28303025271e86e20a0306c..43b03176c692c5c55d999218ffc9450688d710b6 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -1431,19 +1431,11 @@ static enum rtl_dash_type rtl_get_dash_type(struct rtl8169_private *tp)
 
 static void rtl_set_d3_pll_down(struct rtl8169_private *tp, bool enable)
 {
-       switch (tp->mac_version) {
-       case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_26:
-       case RTL_GIGA_MAC_VER_29 ... RTL_GIGA_MAC_VER_30:
-       case RTL_GIGA_MAC_VER_32 ... RTL_GIGA_MAC_VER_37:
-       case RTL_GIGA_MAC_VER_39 ... RTL_GIGA_MAC_VER_66:
-               if (enable)
-                       RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) & ~D3_NO_PLL_DOWN);
-               else
-                       RTL_W8(tp, PMCH, RTL_R8(tp, PMCH) | D3_NO_PLL_DOWN);
-               break;
-       default:
-               break;
-       }
+       if (tp->mac_version >= RTL_GIGA_MAC_VER_25 &&
+           tp->mac_version != RTL_GIGA_MAC_VER_28 &&
+           tp->mac_version != RTL_GIGA_MAC_VER_31 &&
+           tp->mac_version != RTL_GIGA_MAC_VER_38)
+               r8169_mod_reg8_cond(tp, PMCH, D3_NO_PLL_DOWN, !enable);
 }
 
 static void rtl_reset_packet_filter(struct rtl8169_private *tp)