From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 2/2] r8169: remove duplicated RTL8169s PHY initialization steps Date: Wed, 19 Sep 2018 22:02:11 +0200 Message-ID: References: <35548e5c-2421-04b6-b6d7-335c1b7fb62d@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" To: David Miller , Realtek linux nic maintainers Return-path: Received: from mail-wm1-f66.google.com ([209.85.128.66]:51271 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727371AbeITBlu (ORCPT ); Wed, 19 Sep 2018 21:41:50 -0400 Received: by mail-wm1-f66.google.com with SMTP id y2-v6so7561840wma.1 for ; Wed, 19 Sep 2018 13:02:20 -0700 (PDT) In-Reply-To: <35548e5c-2421-04b6-b6d7-335c1b7fb62d@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: 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 --- drivers/net/ethernet/realtek/r8169.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index a27bf5807..e2713867c 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4053,15 +4053,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); -- 2.19.0