r8169: remove unneeded rpm ops in rtl_shutdown

hkallweit · davem330 · commit b9aa1c75e694 · 2018-01-09T12:38:56.000-05:00
This patch reverts commit 2a15cd2 "r8169: runtime resume before shutdown" from 2012. Few months after this change the underlying issue was solved in the PCI core with commit 3ff2de9 "PCI/PM: Resume device before shutdown". Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -8195,9 +8195,6 @@ static void rtl_shutdown(struct pci_dev *pdev)`
`8195`	`8195`	`{`
`8196`	`8196`	`struct net_device *dev = pci_get_drvdata(pdev);`
`8197`	`8197`	`struct rtl8169_private *tp = netdev_priv(dev);`
`8198`		`- struct device *d = &pdev->dev;`
`8199`		`-`
`8200`		`- pm_runtime_get_sync(d);`
`8201`	`8198`
`8202`	`8199`	`rtl8169_net_suspend(dev);`
`8203`	`8200`
`@@ -8215,8 +8212,6 @@ static void rtl_shutdown(struct pci_dev *pdev)`
`8215`	`8212`	`pci_wake_from_d3(pdev, true);`
`8216`	`8213`	`pci_set_power_state(pdev, PCI_D3hot);`
`8217`	`8214`	`}`
`8218`		`-`
`8219`		`- pm_runtime_put_noidle(d);`
`8220`	`8215`	`}`
`8221`	`8216`
`8222`	`8217`	`static void rtl_remove_one(struct pci_dev *pdev)`