]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
r8169: remove duplicated RTL8169s PHY initialization steps
authorHeiner Kallweit <hkallweit1@gmail.com>
Wed, 19 Sep 2018 20:02:11 +0000 (22:02 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Sep 2018 06:06:30 +0000 (23:06 -0700)
Setting register 0x82 to value 01 is done a few lines before for all
chip versions <= 06 anyway. And setting PHY register 0x0b to value 00
is done at the end of rtl8169s_hw_phy_config() already. So we can
remove this.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index 1b49d9e783f853547cbd9e7f948aa517ddbd33ab..1843fafb62d147d3ef85720303359150ea4be521 100644 (file)
@@ -4055,15 +4055,6 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
                RTL_W8(tp, 0x82, 0x01);
        }
 
-       if (tp->mac_version == RTL_GIGA_MAC_VER_02) {
-               netif_dbg(tp, drv, dev,
-                         "Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
-               RTL_W8(tp, 0x82, 0x01);
-               netif_dbg(tp, drv, dev,
-                         "Set PHY Reg 0x0bh = 0x00h\n");
-               rtl_writephy(tp, 0x0b, 0x0000); //w 0x0b 15 0 0
-       }
-
        /* We may have called phy_speed_down before */
        phy_speed_up(dev->phydev);