aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2015-10-06 08:27:42 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-12 17:27:02 -0400
commitbb4b72fc63d4c1c2ccd5e5af95e48b77d6cad80c (patch)
treec93a4e9531db665cd5b6c5944d4bfb970c269be1
parent2376692416b73c51d6f3ba5588b8f19cec617d31 (diff)
PM / Domains: Remove pm_genpd_poweroff_unused() API
As the last user of the pm_genpd_poweroff_unused() API has moved into relying on genpd to deal with this internally from a late_initcall, let's remove the API. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/base/power/domain.c10
-rw-r--r--include/linux/pm_domain.h3
2 files changed, 3 insertions, 10 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index c785f2e398b9..dcd451c85c99 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -501,15 +501,15 @@ static int __init pd_ignore_unused_setup(char *__unused)
501__setup("pd_ignore_unused", pd_ignore_unused_setup); 501__setup("pd_ignore_unused", pd_ignore_unused_setup);
502 502
503/** 503/**
504 * pm_genpd_poweroff_unused - Power off all PM domains with no devices in use. 504 * genpd_poweroff_unused - Power off all PM domains with no devices in use.
505 */ 505 */
506void pm_genpd_poweroff_unused(void) 506static int __init genpd_poweroff_unused(void)
507{ 507{
508 struct generic_pm_domain *genpd; 508 struct generic_pm_domain *genpd;
509 509
510 if (pd_ignore_unused) { 510 if (pd_ignore_unused) {
511 pr_warn("genpd: Not disabling unused power domains\n"); 511 pr_warn("genpd: Not disabling unused power domains\n");
512 return; 512 return 0;
513 } 513 }
514 514
515 mutex_lock(&gpd_list_lock); 515 mutex_lock(&gpd_list_lock);
@@ -518,11 +518,7 @@ void pm_genpd_poweroff_unused(void)
518 genpd_queue_power_off_work(genpd); 518 genpd_queue_power_off_work(genpd);
519 519
520 mutex_unlock(&gpd_list_lock); 520 mutex_unlock(&gpd_list_lock);
521}
522 521
523static int __init genpd_poweroff_unused(void)
524{
525 pm_genpd_poweroff_unused();
526 return 0; 522 return 0;
527} 523}
528late_initcall(genpd_poweroff_unused); 524late_initcall(genpd_poweroff_unused);
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 0eaa730c890d..a736f0f0ca66 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -125,9 +125,7 @@ extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
125 struct generic_pm_domain *target); 125 struct generic_pm_domain *target);
126extern void pm_genpd_init(struct generic_pm_domain *genpd, 126extern void pm_genpd_init(struct generic_pm_domain *genpd,
127 struct dev_power_governor *gov, bool is_off); 127 struct dev_power_governor *gov, bool is_off);
128
129extern int pm_genpd_poweron(struct generic_pm_domain *genpd); 128extern int pm_genpd_poweron(struct generic_pm_domain *genpd);
130extern void pm_genpd_poweroff_unused(void);
131 129
132extern struct dev_power_governor simple_qos_governor; 130extern struct dev_power_governor simple_qos_governor;
133extern struct dev_power_governor pm_domain_always_on_gov; 131extern struct dev_power_governor pm_domain_always_on_gov;
@@ -170,7 +168,6 @@ static inline int pm_genpd_poweron(struct generic_pm_domain *genpd)
170{ 168{
171 return -ENOSYS; 169 return -ENOSYS;
172} 170}
173static inline void pm_genpd_poweroff_unused(void) {}
174#endif 171#endif
175 172
176static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, 173static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,