From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 1/3] r8169: remove unneeded rpm ops in rtl_shutdown Date: Mon, 8 Jan 2018 21:39:02 +0100 Message-ID: <0ad7d702-7793-76c9-e9c3-601cb8a70305@gmail.com> References: <9bc4bf55-04d5-def8-40f2-346902988192@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: Francois Romieu , Florian Fainelli , "netdev@vger.kernel.org" To: Realtek linux nic maintainers , David Miller Return-path: Received: from mail-wm0-f66.google.com ([74.125.82.66]:45996 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757045AbeAHUja (ORCPT ); Mon, 8 Jan 2018 15:39:30 -0500 Received: by mail-wm0-f66.google.com with SMTP id i186so246674wmi.4 for ; Mon, 08 Jan 2018 12:39:30 -0800 (PST) In-Reply-To: <9bc4bf55-04d5-def8-40f2-346902988192@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: This patch reverts commit 2a15cd2ff488 "r8169: runtime resume before shutdown" from 2012. Few months after this change the underlying issue was solved in the PCI core with commit 3ff2de9ba1a2 "PCI/PM: Resume device before shutdown". Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 857f67beb..606fb7698 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -8195,9 +8195,6 @@ static void rtl_shutdown(struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); struct rtl8169_private *tp = netdev_priv(dev); - struct device *d = &pdev->dev; - - pm_runtime_get_sync(d); rtl8169_net_suspend(dev); @@ -8215,8 +8212,6 @@ static void rtl_shutdown(struct pci_dev *pdev) pci_wake_from_d3(pdev, true); pci_set_power_state(pdev, PCI_D3hot); } - - pm_runtime_put_noidle(d); } static void rtl_remove_one(struct pci_dev *pdev) -- 2.15.1