From patchwork Sun Jun 24 16:37:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 933933 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="W1NOy6da"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41DJ2c5F0bz9ry1 for ; Mon, 25 Jun 2018 02:40:40 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751570AbeFXQkh (ORCPT ); Sun, 24 Jun 2018 12:40:37 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:34354 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750864AbeFXQkg (ORCPT ); Sun, 24 Jun 2018 12:40:36 -0400 Received: by mail-wr0-f194.google.com with SMTP id a12-v6so11235344wro.1 for ; Sun, 24 Jun 2018 09:40:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=tWcaxE+Qcg2pw7BgZkR1BQfiZCkOUZdLlvnQMhY82rw=; b=W1NOy6da7aNiLW4D2NOYSpiaK1UWJBMHDr5ttyFA5x7LQ0JgjP28uPbFiFOF6XCvBI n/c3D2P+WBc9h/yvxsHl8AdqHBbiMN/ofhLXXIi2h/qCUfBZ0IoODMcgfFt8TRazpjKM IoD9vRbT/c5TcVuSy3of5rLUkAIaLEu1rKf4WF57So+OB5h9SsDQGNRSuG7euPsXQmEH zvQc+fHtF9xEl1Wg54HZ0af4wb5lLoCuvj4X+3tVHJOIzfiRz2h9DXga49DQPOLWVmWD 3KEL1NzwUmtTE2Vm1WbZl/7mXh+VO5wy1Qgu31VvmkdVidzRfDtcBbmyGvlfNDSUPC0w dNDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=tWcaxE+Qcg2pw7BgZkR1BQfiZCkOUZdLlvnQMhY82rw=; b=M7cX3gzLTzagBpc43exXiTm0LxdQvPvZy6YrlawXvHTss7MHKRc6H7CC+N8e82RZtB RvefBP8UUXauHRljEwVhbfp67ApaPHBI87+rumJL1aQ2E6Q6dgRSQyzfFZMaZRRG4ebZ lGMm06TYT9LNSuUmSzmxgnko1+mKy8owMfqzVUFr8Hc1ZVJv46wyElOL9NtDeUD426jK Ez4BndjDNLob57bpj4YgHNkhRgZm+hpbE+AVmGdHZ5GEAukBDMyYAWNpgnDe+ZT/OMm2 v05jY/LNxgFBfMOSI/uWJWEaJMM8wEnRziheOiRsw349uXHqNIDPrSNq8odAGnhTPuzq F5jw== X-Gm-Message-State: APt69E3jsVWbbSiH3b52PtVxGIQjo1g88K0l30Rh928XGzwkIqxs0ig9 KMGUK0XHkPh4FIWiSGnAUlBkDg== X-Google-Smtp-Source: AAOMgpeLcJVn+i7SRu9kX7klNMSG6s4n5LpkiE5NOA5VDCEdyLEDL1/iUh06Wv7I4UAJMtscBfCifg== X-Received: by 2002:adf:9c12:: with SMTP id f18-v6mr7765334wrc.40.1529858434879; Sun, 24 Jun 2018 09:40:34 -0700 (PDT) Received: from ?IPv6:2003:ea:8bd4:d600:69eb:b56e:456b:3e48? (p200300EA8BD4D60069EBB56E456B3E48.dip0.t-ipconnect.de. [2003:ea:8bd4:d600:69eb:b56e:456b:3e48]) by smtp.googlemail.com with ESMTPSA id v138-v6sm12751433wmd.47.2018.06.24.09.40.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 09:40:34 -0700 (PDT) Subject: [PATCH net-next 1/3] r8169: improve phy initialization when resuming From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" References: Message-ID: Date: Sun, 24 Jun 2018 18:37:36 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Let's move calling rtl8169_init_phy() to __rtl8169_resume(). It simplifies the code and avoids rtl8169_init_phy() being called when resuming whilst interface is down. rtl_open() will initialize the PHY when the interface is brought up. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 44715958..480fb141 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7334,6 +7334,7 @@ static void __rtl8169_resume(struct net_device *dev) netif_device_attach(dev); rtl_pll_power_up(tp); + rtl8169_init_phy(dev, tp); rtl_lock_work(tp); napi_enable(&tp->napi); @@ -7347,9 +7348,6 @@ static int rtl8169_resume(struct device *device) { struct pci_dev *pdev = to_pci_dev(device); struct net_device *dev = pci_get_drvdata(pdev); - struct rtl8169_private *tp = netdev_priv(dev); - - rtl8169_init_phy(dev, tp); if (netif_running(dev)) __rtl8169_resume(dev); @@ -7397,8 +7395,6 @@ static int rtl8169_runtime_resume(struct device *device) tp->saved_wolopts = 0; rtl_unlock_work(tp); - rtl8169_init_phy(dev, tp); - __rtl8169_resume(dev); return 0;