diff options
author | Heiner Kallweit <hkallweit1@gmail.com> | 2018-01-08 15:39:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-09 12:38:56 -0500 |
commit | b9aa1c75e694618e4e2ba32667b89134c7fe2e7c (patch) | |
tree | 54437c063428b53d2916ba77147243820bc68fe4 | |
parent | fdb533c30496665775867fc9dabd83e8b0308822 (diff) |
r8169: remove unneeded rpm ops in rtl_shutdown
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 <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 857f67bebc6a..606fb76982fe 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) | |||
8195 | { | 8195 | { |
8196 | struct net_device *dev = pci_get_drvdata(pdev); | 8196 | struct net_device *dev = pci_get_drvdata(pdev); |
8197 | struct rtl8169_private *tp = netdev_priv(dev); | 8197 | struct rtl8169_private *tp = netdev_priv(dev); |
8198 | struct device *d = &pdev->dev; | ||
8199 | |||
8200 | pm_runtime_get_sync(d); | ||
8201 | 8198 | ||
8202 | rtl8169_net_suspend(dev); | 8199 | rtl8169_net_suspend(dev); |
8203 | 8200 | ||
@@ -8215,8 +8212,6 @@ static void rtl_shutdown(struct pci_dev *pdev) | |||
8215 | pci_wake_from_d3(pdev, true); | 8212 | pci_wake_from_d3(pdev, true); |
8216 | pci_set_power_state(pdev, PCI_D3hot); | 8213 | pci_set_power_state(pdev, PCI_D3hot); |
8217 | } | 8214 | } |
8218 | |||
8219 | pm_runtime_put_noidle(d); | ||
8220 | } | 8215 | } |
8221 | 8216 | ||
8222 | static void rtl_remove_one(struct pci_dev *pdev) | 8217 | static void rtl_remove_one(struct pci_dev *pdev) |