diff options
-rw-r--r-- | drivers/base/power/domain.c | 5 | ||||
-rw-r--r-- | include/linux/pm_domain.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 601e35b2fa71..d71d0458d41f 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c | |||
@@ -422,7 +422,7 @@ static bool genpd_abort_poweroff(struct generic_pm_domain *genpd) | |||
422 | * Queue up the execution of pm_genpd_poweroff() unless it's already been done | 422 | * Queue up the execution of pm_genpd_poweroff() unless it's already been done |
423 | * before. | 423 | * before. |
424 | */ | 424 | */ |
425 | void genpd_queue_power_off_work(struct generic_pm_domain *genpd) | 425 | static void genpd_queue_power_off_work(struct generic_pm_domain *genpd) |
426 | { | 426 | { |
427 | queue_work(pm_wq, &genpd->power_off_work); | 427 | queue_work(pm_wq, &genpd->power_off_work); |
428 | } | 428 | } |
@@ -729,6 +729,9 @@ static inline int genpd_dev_pm_qos_notifier(struct notifier_block *nb, | |||
729 | return NOTIFY_DONE; | 729 | return NOTIFY_DONE; |
730 | } | 730 | } |
731 | 731 | ||
732 | static inline void | ||
733 | genpd_queue_power_off_work(struct generic_pm_domain *genpd) {} | ||
734 | |||
732 | static inline void genpd_power_off_work_fn(struct work_struct *work) {} | 735 | static inline void genpd_power_off_work_fn(struct work_struct *work) {} |
733 | 736 | ||
734 | #define pm_genpd_runtime_suspend NULL | 737 | #define pm_genpd_runtime_suspend NULL |
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 3997af691600..c19c90b839b8 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h | |||
@@ -258,10 +258,8 @@ static inline int pm_genpd_name_add_device(const char *domain_name, | |||
258 | } | 258 | } |
259 | 259 | ||
260 | #ifdef CONFIG_PM_GENERIC_DOMAINS_RUNTIME | 260 | #ifdef CONFIG_PM_GENERIC_DOMAINS_RUNTIME |
261 | extern void genpd_queue_power_off_work(struct generic_pm_domain *genpd); | ||
262 | extern void pm_genpd_poweroff_unused(void); | 261 | extern void pm_genpd_poweroff_unused(void); |
263 | #else | 262 | #else |
264 | static inline void genpd_queue_power_off_work(struct generic_pm_domain *gpd) {} | ||
265 | static inline void pm_genpd_poweroff_unused(void) {} | 263 | static inline void pm_genpd_poweroff_unused(void) {} |
266 | #endif | 264 | #endif |
267 | 265 | ||