| From d68d1d65868aadd10c580d02b365a7c01ee01a3b Mon Sep 17 00:00:00 2001 |
| From: "Rafael J. Wysocki" <rjw@sisk.pl> |
| Date: Thu, 14 Jul 2011 20:59:07 +0200 |
| Subject: ARM / shmobile: Use genpd_queue_power_off_work() |
| |
| Make pd_power_down_a3rv() use genpd_queue_power_off_work() to queue |
| up the powering off of the A4LC domain to avoid queuing it up when |
| it is pending. |
| |
| Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> |
| Acked-by: Magnus Damm <damm@opensource.se> |
| (cherry picked from commit 0bc5b2debb832191a42baea7ff59d2ca6ce9f7d5) |
| |
| Conflicts: |
| |
| arch/arm/mach-shmobile/pm-sh7372.c |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| drivers/base/power/domain.c | 2 +- |
| include/linux/pm_domain.h | 2 ++ |
| 2 files changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c |
| index c2c537d..00ed4f3 100644 |
| --- a/drivers/base/power/domain.c |
| +++ b/drivers/base/power/domain.c |
| @@ -222,7 +222,7 @@ static bool genpd_abort_poweroff(struct generic_pm_domain *genpd) |
| * Queue up the execution of pm_genpd_poweroff() unless it's already been done |
| * before. |
| */ |
| -static void genpd_queue_power_off_work(struct generic_pm_domain *genpd) |
| +void genpd_queue_power_off_work(struct generic_pm_domain *genpd) |
| { |
| if (!work_pending(&genpd->power_off_work)) |
| queue_work(pm_wq, &genpd->power_off_work); |
| diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h |
| index 3e4f3d3..21097cb 100644 |
| --- a/include/linux/pm_domain.h |
| +++ b/include/linux/pm_domain.h |
| @@ -73,6 +73,7 @@ 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 void genpd_queue_power_off_work(struct generic_pm_domain *genpd); |
| #else |
| static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, |
| struct device *dev) |
| @@ -101,6 +102,7 @@ static inline int pm_genpd_poweron(struct generic_pm_domain *genpd) |
| return -ENOSYS; |
| } |
| static inline void pm_genpd_poweroff_unused(void) {} |
| +static inline void genpd_queue_power_off_work(struct generic_pm_domain *gpd) {} |
| #endif |
| |
| #endif /* _LINUX_PM_DOMAIN_H */ |
| -- |
| 1.7.10.1.362.g242cab3 |
| |
