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>

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index c785f2e398b978a1e8a558cf5c2f143d105a3be5..dcd451c85c99df55f30a28cfec2281dd22b1674b 100644 (file)
--- 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)
 __setup("pd_ignore_unused", pd_ignore_unused_setup);
 
 /**
- * pm_genpd_poweroff_unused - Power off all PM domains with no devices in use.
+ * genpd_poweroff_unused - Power off all PM domains with no devices in use.
  */
-void pm_genpd_poweroff_unused(void)
+static int __init genpd_poweroff_unused(void)
 {
        struct generic_pm_domain *genpd;
 
        if (pd_ignore_unused) {
                pr_warn("genpd: Not disabling unused power domains\n");
-               return;
+               return 0;
        }
 
        mutex_lock(&gpd_list_lock);
@@ -518,11 +518,7 @@ void pm_genpd_poweroff_unused(void)
                genpd_queue_power_off_work(genpd);
 
        mutex_unlock(&gpd_list_lock);
-}
 
-static int __init genpd_poweroff_unused(void)
-{
-       pm_genpd_poweroff_unused();
        return 0;
 }
 late_initcall(genpd_poweroff_unused);

diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 0eaa730c890d3e158b054a2d12880c4fde701dc7..a736f0f0ca6638e1493d6cf1dff79535da743f23 100644 (file)
--- 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,
                                     struct generic_pm_domain *target);
 extern void pm_genpd_init(struct generic_pm_domain *genpd,
                          struct dev_power_governor *gov, bool is_off);
-
 extern int pm_genpd_poweron(struct generic_pm_domain *genpd);
-extern void pm_genpd_poweroff_unused(void);
 
 extern struct dev_power_governor simple_qos_governor;
 extern struct dev_power_governor pm_domain_always_on_gov;
@@ -170,7 +168,6 @@ static inline int pm_genpd_poweron(struct generic_pm_domain *genpd)
 {
        return -ENOSYS;
 }
-static inline void pm_genpd_poweroff_unused(void) {}
 #endif
 
 static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,