diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 01:54:22 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-28 01:54:22 +0200 |
| commit | 0acaab5367a2c4140bd965a0ad3ea265af4d43ed (patch) | |
| tree | 944fc8279a28c94e136325ec337ebe216a129ec1 /drivers/base | |
| parent | c940c8ce1db3ed3909d31c02aef01a864565519c (diff) | |
| parent | 841670351e8e5acbe9f7367f7df661a5d0cfef79 (diff) | |
| download | linux-3.10-0acaab5367a2c4140bd965a0ad3ea265af4d43ed.tar.gz linux-3.10-0acaab5367a2c4140bd965a0ad3ea265af4d43ed.tar.bz2 linux-3.10-0acaab5367a2c4140bd965a0ad3ea265af4d43ed.zip | |
Merge branch 'pm-runtime'
* pm-runtime:
PM / Runtime: Improve prepare handling at system suspend for genpd
PM / Runtime: Asyncronous idle|suspend parent devices at removal
PM / Runtime: Asyncronous idle|suspend devices at system resume
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/domain.c | 6 | ||||
| -rw-r--r-- | drivers/base/power/generic_ops.c | 2 | ||||
| -rw-r--r-- | drivers/base/power/main.c | 2 | ||||
| -rw-r--r-- | drivers/base/power/runtime.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 9a6b05a3560..7072404c8b6 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -920,7 +920,7 @@ static int pm_genpd_prepare(struct device *dev) pm_wakeup_event(dev, 0); if (pm_wakeup_pending()) { - pm_runtime_put_sync(dev); + pm_runtime_put(dev); return -EBUSY; } @@ -961,7 +961,7 @@ static int pm_genpd_prepare(struct device *dev) pm_runtime_enable(dev); } - pm_runtime_put_sync(dev); + pm_runtime_put(dev); return ret; } @@ -1327,7 +1327,7 @@ static void pm_genpd_complete(struct device *dev) pm_generic_complete(dev); pm_runtime_set_active(dev); pm_runtime_enable(dev); - pm_runtime_idle(dev); + pm_request_idle(dev); } } diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c index d03d290f31c..bfd898b8988 100644 --- a/drivers/base/power/generic_ops.c +++ b/drivers/base/power/generic_ops.c @@ -324,6 +324,6 @@ void pm_generic_complete(struct device *dev) * Let runtime PM try to suspend devices that haven't been in use before * going into the system-wide sleep state we're resuming from. */ - pm_runtime_idle(dev); + pm_request_idle(dev); } #endif /* CONFIG_PM_SLEEP */ diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 15beb500a4e..5a9b6569dd7 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -756,7 +756,7 @@ static void device_complete(struct device *dev, pm_message_t state) device_unlock(dev); - pm_runtime_put_sync(dev); + pm_runtime_put(dev); } /** diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 1244930e3d7..ef13ad08afb 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -1400,5 +1400,5 @@ void pm_runtime_remove(struct device *dev) if (dev->power.runtime_status == RPM_ACTIVE) pm_runtime_set_suspended(dev); if (dev->power.irq_safe && dev->parent) - pm_runtime_put_sync(dev->parent); + pm_runtime_put(dev->parent); } |