From: Mark Lord Date: Thu, 8 Nov 2007 21:29:07 +0000 (+0100) Subject: r8169: revert 7da97ec96a0934319c7fbedd3d38baf533e20640 (bis repetita) X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=50d84c2dc00e48ff9ba018ed0dd23276cf79e566;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git r8169: revert 7da97ec96a0934319c7fbedd3d38baf533e20640 (bis repetita) RTL_GIGA_MAC_VER_17 breaks as well. Signed-off-by: Mark Lord Signed-off-by: Francois Romieu Cc: Edward Hsu --- diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index a37cf82b9ea7..f9ba2e478a69 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1247,16 +1247,6 @@ static void rtl8169sb_hw_phy_config(void __iomem *ioaddr) rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init)); } -static void rtl8168b_hw_phy_config(void __iomem *ioaddr) -{ - struct phy_reg phy_reg_init[] = { - { 0x1f, 0x0000 }, - { 0x10, 0xf41b }, - { 0x1f, 0x0000 } - }; - - rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init)); -} static void rtl8168cp_hw_phy_config(void __iomem *ioaddr) { @@ -1326,12 +1316,6 @@ static void rtl_hw_phy_config(struct net_device *dev) case RTL_GIGA_MAC_VER_04: rtl8169sb_hw_phy_config(ioaddr); break; - case RTL_GIGA_MAC_VER_11: - case RTL_GIGA_MAC_VER_12: - break; - case RTL_GIGA_MAC_VER_17: - rtl8168b_hw_phy_config(ioaddr); - break; case RTL_GIGA_MAC_VER_18: rtl8168cp_hw_phy_config(ioaddr); break;