]> git.baikalelectronics.ru Git - kernel.git/commitdiff
r8169: remove unneeded rpm ops in rtl_shutdown
authorHeiner Kallweit <hkallweit1@gmail.com>
Mon, 8 Jan 2018 20:39:02 +0000 (21:39 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Jan 2018 17:38:56 +0000 (12:38 -0500)
This patch reverts commit c45858303193 "r8169: runtime resume before
shutdown" from 2012. Few months after this change the underlying issue
was solved in the PCI core with commit 88b3b7a69d5c "PCI/PM: Resume
device before shutdown".

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index 857f67bebc6a72728e1484a11b669f9a64386562..606fb76982fe235925f3c28ad03a53dbcef9bd25 100644 (file)
@@ -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)