diff options
author | Magnus Damm <damm@opensource.se> | 2011-07-10 04:39:14 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-07-10 04:39:14 -0400 |
commit | 18b4f3f5d058b590e7189027eeb5d897742ade0a (patch) | |
tree | 8cc1c52f77e218593fc8cea275f57b6ba5e4076b | |
parent | b9416f03fd9f809225a90f63b2fbc86f90010eab (diff) |
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.c | 2 | ||||
-rw-r--r-- | include/linux/pm_domain.h | 5 |
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) | |||
37 | * Restore power to @genpd and all of its parents so that it is possible to | 37 | * Restore power to @genpd and all of its parents so that it is possible to |
38 | * resume a device belonging to it. | 38 | * resume a device belonging to it. |
39 | */ | 39 | */ |
40 | static int pm_genpd_poweron(struct generic_pm_domain *genpd) | 40 | int pm_genpd_poweron(struct generic_pm_domain *genpd) |
41 | { | 41 | { |
42 | int ret = 0; | 42 | int ret = 0; |
43 | 43 | ||
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, | |||
63 | struct generic_pm_domain *target); | 63 | struct generic_pm_domain *target); |
64 | extern void pm_genpd_init(struct generic_pm_domain *genpd, | 64 | extern void pm_genpd_init(struct generic_pm_domain *genpd, |
65 | struct dev_power_governor *gov, bool is_off); | 65 | struct dev_power_governor *gov, bool is_off); |
66 | extern int pm_genpd_poweron(struct generic_pm_domain *genpd); | ||
66 | #else | 67 | #else |
67 | static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, | 68 | static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, |
68 | struct device *dev) | 69 | struct device *dev) |
@@ -86,6 +87,10 @@ static inline int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, | |||
86 | } | 87 | } |
87 | static inline void pm_genpd_init(struct generic_pm_domain *genpd, | 88 | static inline void pm_genpd_init(struct generic_pm_domain *genpd, |
88 | struct dev_power_governor *gov, bool is_off) {} | 89 | struct dev_power_governor *gov, bool is_off) {} |
90 | static inline int pm_genpd_poweron(struct generic_pm_domain *genpd) | ||
91 | { | ||
92 | return -ENOSYS; | ||
93 | } | ||
89 | #endif | 94 | #endif |
90 | 95 | ||
91 | #endif /* _LINUX_PM_DOMAIN_H */ | 96 | #endif /* _LINUX_PM_DOMAIN_H */ |