From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 01/10] r8169: remove unneeded check in r8168_pll_power_down Date: Wed, 2 May 2018 21:39:35 +0200 Message-ID: <4610d5be-8f8d-c89a-6bfe-bcd6fd497b63@gmail.com> References: <2c7cae9e-d989-8529-7209-5a271242ce39@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-wr0-f195.google.com ([209.85.128.195]:42961 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751181AbeEBTkJ (ORCPT ); Wed, 2 May 2018 15:40:09 -0400 Received: by mail-wr0-f195.google.com with SMTP id v5-v6so15226973wrf.9 for ; Wed, 02 May 2018 12:40:08 -0700 (PDT) In-Reply-To: <2c7cae9e-d989-8529-7209-5a271242ce39@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: RTL_GIGA_MAC_VER_23/24 are configured by rtl_hw_start_8168cp_2() and rtl_hw_start_8168cp_3() respectively which both apply CPCMD_QUIRK_MASK, thus clearing bit ASF. Bit ASF isn't set at any other place in the driver, therefore this check can be removed. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 66f10d11..ce7843aa 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4838,12 +4838,6 @@ static void r8168_pll_power_down(struct rtl8169_private *tp) if (r8168_check_dash(tp)) return; - if ((tp->mac_version == RTL_GIGA_MAC_VER_23 || - tp->mac_version == RTL_GIGA_MAC_VER_24) && - (tp->cp_cmd & ASF)) { - return; - } - if (tp->mac_version == RTL_GIGA_MAC_VER_32 || tp->mac_version == RTL_GIGA_MAC_VER_33) rtl_ephy_write(tp, 0x19, 0xff64); -- 2.17.0