From patchwork Thu Jan 31 21:03:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 1034466 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YIDhnmLd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rCQR2Npwz9s9G for ; Fri, 1 Feb 2019 08:03:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728768AbfAaVD5 (ORCPT ); Thu, 31 Jan 2019 16:03:57 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:54889 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726963AbfAaVD5 (ORCPT ); Thu, 31 Jan 2019 16:03:57 -0500 Received: by mail-wm1-f66.google.com with SMTP id a62so3947271wmh.4 for ; Thu, 31 Jan 2019 13:03:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=I3Zf1xfSzXY/194QIh/MzUXVyUF17qfjlp8szaeBwzc=; b=YIDhnmLdatTRNoJ1BcJL43PR56efj34VJyn8OCfxRlsn3w1r9W5uszctloWE6+J+8k 3Kwd0cmywYA0kvlsljwrR2m30Z25ZSZKKHsivoOO3StqtQc4lXiHUOV55uN6pH9zGJeF U7YauNcw4M19n3tp8TkGT08p75IslthnVwc1YazTWn4DQtafwm8pZPUhLNhgiYwLNLVp H9gPCdacxFZWrvKFNl/V0bPj3sMQhC9+Q8w/PtusJR0rnLbU3ccqSvogethr3fJDy3Qq ChN668k1Ysz8PbARn9qvl1ah+dwDP+KzaY2BGCjpk2exC/lXdKOuYlFs+rls6zKhEJWe mKAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=I3Zf1xfSzXY/194QIh/MzUXVyUF17qfjlp8szaeBwzc=; b=lsaU4h6pyoEz9a3hF6rBCbWIBgobDVw1py2FvuxLgENIOAz3oU63QYN5YWRT7Wpytv WEwXfG+1oGU2RwXhAx5825l3TJQw+wmYurR/BFFXzlv2n/mPWFWSxcNMOT2SX0BK+2YZ cauhcctaWR7eC5++V6MqGRvp8/koa6xnG/Jr57s8YdSCji6I0sXt3iVHEWTgFmsz3Xr3 siVoh6Oih+P1zrlzCST30Kh5x5uKOapRUYNm9aU5o7CaL5lRLkxRRxccT49lhSpM15NT S4BKoPOvxKXhIQROp7tx0jmC7Iwaa/L1rDDL9uYDSh2kclthz7WN0i5Z3w0+oh8ds/Fk qU1w== X-Gm-Message-State: AJcUukfU+nUyI3P52WpfRvXuwttryPTosPDE1Z05kF0AAwgjlR6uBO/n rYizpQyGjUtr6zABKhJRngNGhLc4 X-Google-Smtp-Source: ALg8bN7/9JafQBIu5rq/5ewW5ZvPip8Wk6yRYece2FpDRt8bDi+jUtC1VlzJy4XPc3cFj4jW/kO2uw== X-Received: by 2002:a1c:2944:: with SMTP id p65mr30409050wmp.20.1548968634590; Thu, 31 Jan 2019 13:03:54 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:456f:ee03:474f:a529? (p200300EA8BF1E200456FEE03474FA529.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:456f:ee03:474f:a529]) by smtp.googlemail.com with ESMTPSA id p10sm4129541wrt.25.2019.01.31.13.03.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 13:03:53 -0800 (PST) To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH net-next] r8169: remove rtl_wol_pll_power_down Message-ID: <8fbc37cf-c719-1b2e-12c9-ec98c414a130@gmail.com> Date: Thu, 31 Jan 2019 22:03:48 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rtl_wol_pll_power_down() is used in only one place and removing it makes the code simpler and better readable. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 9dc689817..e8a112149 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4247,17 +4247,6 @@ static void rtl_wol_suspend_quirk(struct rtl8169_private *tp) } } -static bool rtl_wol_pll_power_down(struct rtl8169_private *tp) -{ - if (!device_may_wakeup(tp_to_dev(tp))) - return false; - - phy_speed_down(tp->phydev, false); - rtl_wol_suspend_quirk(tp); - - return true; -} - static void r8168_pll_power_down(struct rtl8169_private *tp) { if (r8168_check_dash(tp)) @@ -4267,8 +4256,11 @@ static void r8168_pll_power_down(struct rtl8169_private *tp) tp->mac_version == RTL_GIGA_MAC_VER_33) rtl_ephy_write(tp, 0x19, 0xff64); - if (rtl_wol_pll_power_down(tp)) + if (device_may_wakeup(tp_to_dev(tp))) { + phy_speed_down(tp->phydev, false); + rtl_wol_suspend_quirk(tp); return; + } switch (tp->mac_version) { case RTL_GIGA_MAC_VER_25 ... RTL_GIGA_MAC_VER_33: