aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pm_domain.h
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2015-09-29 15:12:37 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-12 23:19:55 +0200
commitf96b3c4f34b294a2293a5aa1d55e12e66aee055d (patch)
tree8d47b988d288d30c437d1ff7ca9ffdcfef2aa042 /include/linux/pm_domain.h
parentPM / domains: Drop unused label (diff)
downloadlinux-dev-f96b3c4f34b294a2293a5aa1d55e12e66aee055d.tar.xz
linux-dev-f96b3c4f34b294a2293a5aa1d55e12e66aee055d.zip
PM / Domains: Remove in_progress counter from struct generic_pm_domain
Commit ba2bbfbf6307 ("PM / Domains: Remove intermediate states..") changed the power off sequence (pm_genpd_poweroff()), which from locking point of view means the genpd mutex is held throughout the sequence. The above change means the in_progress counter can't be updated while pm_genpd_poweroff() is executing, which allows us to remove the counter. Instead we inform pm_genpd_poweroff() via a bool parameter, to indicate whether we call it from the scheduled work or from the ->runtime_suspend() callback, since that all that matters. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Lina Iyer <lina.iyer@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/pm_domain.h')
-rw-r--r--include/linux/pm_domain.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 384b1d193707..0eaa730c890d 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -47,7 +47,6 @@ struct generic_pm_domain {
struct dev_power_governor *gov;
struct work_struct power_off_work;
const char *name;
- unsigned int in_progress; /* Number of devices being suspended now */
atomic_t sd_count; /* Number of subdomains with power "on" */
enum gpd_status status; /* Current state of the domain */
unsigned int device_count; /* Number of devices */