r8169: remove support for chip version 41

Detection of this chip version has been disabled for few kernel versions now.
Nobody complained, so remove support for this chip version.

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.h b/drivers/net/ethernet/realtek/r8169.h
index 8da4b66..e2ace50 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
@@ -51,7 +51,7 @@ enum mac_version {
        RTL_GIGA_MAC_VER_38,
        RTL_GIGA_MAC_VER_39,
        RTL_GIGA_MAC_VER_40,
-       RTL_GIGA_MAC_VER_41,
+       /* support for RTL_GIGA_MAC_VER_41 has been removed */
        RTL_GIGA_MAC_VER_42,
        RTL_GIGA_MAC_VER_43,
        RTL_GIGA_MAC_VER_44,

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 1b7fdb4..a2baeb8 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -131,7 +131,6 @@ static const struct {
        [RTL_GIGA_MAC_VER_38] = {"RTL8411",             FIRMWARE_8411_1 },
        [RTL_GIGA_MAC_VER_39] = {"RTL8106e",            FIRMWARE_8106E_1},
        [RTL_GIGA_MAC_VER_40] = {"RTL8168g/8111g",      FIRMWARE_8168G_2},
-       [RTL_GIGA_MAC_VER_41] = {"RTL8168g/8111g"                       },
        [RTL_GIGA_MAC_VER_42] = {"RTL8168gu/8111gu",    FIRMWARE_8168G_3},
        [RTL_GIGA_MAC_VER_43] = {"RTL8106eus",          FIRMWARE_8106E_2},
        [RTL_GIGA_MAC_VER_44] = {"RTL8411b",            FIRMWARE_8411_2 },
@@ -892,7 +891,6 @@ static void rtl8168g_phy_suspend_quirk(struct rtl8169_private *tp, int value)
 {
        switch (tp->mac_version) {
        case RTL_GIGA_MAC_VER_40:
-       case RTL_GIGA_MAC_VER_41:
        case RTL_GIGA_MAC_VER_49:
                if (value & BMCR_RESET || !(value & BMCR_PDOWN))
                        rtl_eri_set_bits(tp, 0x1a8, 0xfc000000);
@@ -3748,7 +3746,6 @@ static void rtl_hw_config(struct rtl8169_private *tp)
                [RTL_GIGA_MAC_VER_38] = rtl_hw_start_8411,
                [RTL_GIGA_MAC_VER_39] = rtl_hw_start_8106,
                [RTL_GIGA_MAC_VER_40] = rtl_hw_start_8168g_1,
-               [RTL_GIGA_MAC_VER_41] = rtl_hw_start_8168g_1,
                [RTL_GIGA_MAC_VER_42] = rtl_hw_start_8168g_2,
                [RTL_GIGA_MAC_VER_43] = rtl_hw_start_8168g_2,
                [RTL_GIGA_MAC_VER_44] = rtl_hw_start_8411_2,

diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
index 15c295f..2b4bc2d 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -1266,7 +1266,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
                [RTL_GIGA_MAC_VER_38] = rtl8411_hw_phy_config,
                [RTL_GIGA_MAC_VER_39] = rtl8106e_hw_phy_config,
                [RTL_GIGA_MAC_VER_40] = rtl8168g_1_hw_phy_config,
-               [RTL_GIGA_MAC_VER_41] = NULL,
                [RTL_GIGA_MAC_VER_42] = rtl8168g_2_hw_phy_config,
                [RTL_GIGA_MAC_VER_43] = rtl8168g_2_hw_phy_config,
                [RTL_GIGA_MAC_VER_44] = rtl8168g_2_hw_phy_config,