summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2011-07-10 10:39:14 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2011-07-10 10:39:14 +0200
commit18b4f3f5d058b590e7189027eeb5d897742ade0a (patch)
tree8cc1c52f77e218593fc8cea275f57b6ba5e4076b
parentb9416f03fd9f809225a90f63b2fbc86f90010eab (diff)
downloadlinux-stable-18b4f3f5d058b590e7189027eeb5d897742ade0a.tar.gz
linux-stable-18b4f3f5d058b590e7189027eeb5d897742ade0a.tar.bz2
linux-stable-18b4f3f5d058b590e7189027eeb5d897742ade0a.zip
PM / Domains: Export pm_genpd_poweron() in header
Allow SoC-specific code to call pm_genpd_poweron(). Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--drivers/base/power/domain.c2
-rw-r--r--include/linux/pm_domain.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 1aed94c73cfc..1f1a7d85f29d 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -37,7 +37,7 @@ static void genpd_sd_counter_dec(struct generic_pm_domain *genpd)
* Restore power to @genpd and all of its parents so that it is possible to
* resume a device belonging to it.
*/
-static int pm_genpd_poweron(struct generic_pm_domain *genpd)
+int pm_genpd_poweron(struct generic_pm_domain *genpd)
{
int ret = 0;
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 98491ee35102..14fb0953fa47 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -63,6 +63,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);
#else
static inline int pm_genpd_add_device(struct generic_pm_domain *genpd,
struct device *dev)
@@ -86,6 +87,10 @@ static inline int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
}
static inline void pm_genpd_init(struct generic_pm_domain *genpd,
struct dev_power_governor *gov, bool is_off) {}
+static inline int pm_genpd_poweron(struct generic_pm_domain *genpd)
+{
+ return -ENOSYS;
+}
#endif
#endif /* _LINUX_PM_DOMAIN_H */