Merge branches 'pm-domains', 'powercap' and 'pm-tools'

[cascardo/linux.git] / include / linux / pm_domain.h

diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index ba7ca54..a9edab2 100644 (file)
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -156,6 +156,7 @@ extern void pm_genpd_init(struct generic_pm_domain *genpd,
 
 extern int pm_genpd_poweron(struct generic_pm_domain *genpd);
 extern int pm_genpd_name_poweron(const char *domain_name);
 
 extern int pm_genpd_poweron(struct generic_pm_domain *genpd);
 extern int pm_genpd_name_poweron(const char *domain_name);

+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;
 
 extern struct dev_power_governor simple_qos_governor;
 extern struct dev_power_governor pm_domain_always_on_gov;


@@ -230,6 +231,7 @@ static inline int pm_genpd_name_poweron(const char *domain_name)
 {
        return -ENOSYS;
 }
 {
        return -ENOSYS;
 }

+static inline void pm_genpd_poweroff_unused(void) {}

 #define simple_qos_governor NULL
 #define pm_domain_always_on_gov NULL
 #endif
 #define simple_qos_governor NULL
 #define pm_domain_always_on_gov NULL
 #endif


@@ -246,12 +248,6 @@ static inline int pm_genpd_name_add_device(const char *domain_name,
        return __pm_genpd_name_add_device(domain_name, dev, NULL);
 }
 
        return __pm_genpd_name_add_device(domain_name, dev, NULL);
 }
 

-#ifdef CONFIG_PM_GENERIC_DOMAINS_RUNTIME
-extern void pm_genpd_poweroff_unused(void);
-#else
-static inline void pm_genpd_poweroff_unused(void) {}
-#endif
-

 #ifdef CONFIG_PM_GENERIC_DOMAINS_SLEEP
 extern void pm_genpd_syscore_poweroff(struct device *dev);
 extern void pm_genpd_syscore_poweron(struct device *dev);
 #ifdef CONFIG_PM_GENERIC_DOMAINS_SLEEP
 extern void pm_genpd_syscore_poweroff(struct device *dev);
 extern void pm_genpd_syscore_poweron(struct device *dev);