PCI: change device runtime PM settings for probe and remove

This patch (as1388) changes the way the PCI core handles runtime PM
settings when probing or unbinding drivers.  Now the core will make
sure the device is enabled for runtime PM, with a usage count >= 1,
when a driver is probed.  It does the same when calling a driver's
remove method.

If the driver wants to use runtime PM, all it has to do is call
pm_runtime_pu_noidle() near the end of its probe routine (to cancel
the core's usage increment) and pm_runtime_get_noresume() near the
start of its remove routine (to restore the usage count).  It does not
need to mess around with setting the runtime state to enabled,
disabled, active, or suspended.

The patch updates e1000e and r8169, the only PCI drivers that already
use the existing runtime PM interface.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index cdc6a5c2e70d..c982a4763bef 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3219,11 +3219,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
 
-        if (pci_dev_run_wake(pdev)) {
-                pm_runtime_set_active(&pdev->dev);
-                pm_runtime_enable(&pdev->dev);
-        }
-        pm_runtime_idle(&pdev->dev);
+        if (pci_dev_run_wake(pdev))
+                pm_runtime_put_noidle(&pdev->dev);
 
 out:
         return rc;
@@ -3246,17 +3243,12 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
         struct net_device *dev = pci_get_drvdata(pdev);
         struct rtl8169_private *tp = netdev_priv(dev);
 
-        pm_runtime_get_sync(&pdev->dev);
-
         flush_scheduled_work();
 
         unregister_netdev(dev);
 
-        if (pci_dev_run_wake(pdev)) {
-                pm_runtime_disable(&pdev->dev);
-                pm_runtime_set_suspended(&pdev->dev);
-        }
-        pm_runtime_put_noidle(&pdev->dev);
+        if (pci_dev_run_wake(pdev))
+                pm_runtime_get_noresume(&pdev->dev);
 
         /* restore original MAC address */
         rtl_rar_set(tp, dev->perm_addr);