diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2011-08-26 14:14:35 +0530 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 16:00:16 +0200 |
| commit | 4c7a098a93c548f750c7c3f6c6f13a1be151783d (patch) | |
| tree | 6b6be0d9f15802747041c45018069456acefd762 /drivers/base | |
| parent | 835fcc28a2098cb00e19a4eead3d8705b0f0d381 (diff) | |
Revert duplicate merge of "PM: Add support for device power domains"
This reverts commit 56e7ee03819e3a43da7eb13428c19714c4d914c2:
commit 56e7ee03819e3a43da7eb13428c19714c4d914c2
Author: Rafael J. Wysocki <rjw@sisk.pl>
AuthorDate: Wed Feb 16 21:53:17 2011 +0100
Commit: Philippe Langlais <philippe.langlais@linaro.org>
CommitDate: Fri Jul 22 15:36:46 2011 +0200
PM: Add support for device power domains
The correct commit is already present in 3.0, and the above was
incorrectly merged, leading to power domain callbacks being
called twice. The correct commit is:
commit 7538e3db6e015e890825fbd9f8659952896ddd5b
Author: Rafael J. Wysocki <rjw@sisk.pl>
AuthorDate: Wed Feb 16 21:53:17 2011 +0100
Commit: Rafael J. Wysocki <rjw@sisk.pl>
CommitDate: Tue Mar 15 00:43:16 2011 +0100
PM: Add support for device power domains
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 7 | ||||
| -rw-r--r-- | drivers/base/power/runtime.c | 16 |
2 files changed, 2 insertions, 21 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index f88c4295be6..4282d442d35 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -927,13 +927,6 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) pm_dev_dbg(dev, state, "legacy "); error = legacy_suspend(dev, state, dev->bus->suspend); } - if (error) - goto End; - } - - if (dev->pwr_domain) { - pm_dev_dbg(dev, state, "power domain "); - pm_op(dev, &dev->pwr_domain->ops, state); } End: diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 69d6f1d4805..0d4587b15c5 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -168,7 +168,6 @@ static int rpm_check_suspend_allowed(struct device *dev) static int rpm_idle(struct device *dev, int rpmflags) { int (*callback)(struct device *); - int (*domain_callback)(struct device *); int retval; retval = rpm_check_suspend_allowed(dev); @@ -225,19 +224,10 @@ static int rpm_idle(struct device *dev, int rpmflags) else callback = NULL; - if (dev->pwr_domain) - domain_callback = dev->pwr_domain->ops.runtime_idle; - else - domain_callback = NULL; - - if (callback || domain_callback) { + if (callback) { spin_unlock_irq(&dev->power.lock); - if (domain_callback) - retval = domain_callback(dev); - - if (!retval && callback) - callback(dev); + callback(dev); spin_lock_irq(&dev->power.lock); } @@ -404,8 +394,6 @@ static int rpm_suspend(struct device *dev, int rpmflags) else pm_runtime_cancel_pending(dev); } else { - if (dev->pwr_domain) - rpm_callback(dev->pwr_domain->ops.runtime_suspend, dev); no_callback: __update_runtime_status(dev, RPM_SUSPENDED); pm_runtime_deactivate_timer(dev); |