diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 00:54:30 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-02 00:54:30 +0100 |
| commit | dcf3d0183f100a14f60eb5993e124a4a1322ee9a (patch) | |
| tree | f2263904aec923f249fbe18aaa7d20068b6ec90b /drivers/base/power/domain_governor.c | |
| parent | 69f8947b8c4777f58d90cc79da2e124570d9e6f0 (diff) | |
| parent | 2b1d88cda32f81685bae45c00bf517f77bcda3cd (diff) | |
Merge branch 'pm-domains'
* pm-domains:
PM / Domains: Merge measurements for PM QoS device latencies
PM / Domains: Don't measure ->start|stop() latency in system PM callbacks
PM / Domains: Rename *pm_genpd_poweron|poweroff()
PM / Domains: Remove pm_genpd_poweron() API
PM / Domains: Remove pm_genpd_poweroff_unused() API
soc: dove: Let genpd deal with disabling of unused PM domains
PM / Domains: Remove in_progress counter from struct generic_pm_domain
PM / domains: Drop unused label
PM / Domains: Remove cpuidle attach
PM / Domains: Remove name based API for genpd
Diffstat (limited to 'drivers/base/power/domain_governor.c')
| -rw-r--r-- | drivers/base/power/domain_governor.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c index 85e17bacc834..e60dd12e23aa 100644 --- a/drivers/base/power/domain_governor.c +++ b/drivers/base/power/domain_governor.c @@ -77,10 +77,8 @@ static bool default_stop_ok(struct device *dev) dev_update_qos_constraint); if (constraint_ns > 0) { - constraint_ns -= td->save_state_latency_ns + - td->stop_latency_ns + - td->start_latency_ns + - td->restore_state_latency_ns; + constraint_ns -= td->suspend_latency_ns + + td->resume_latency_ns; if (constraint_ns == 0) return false; } |