diff options
Diffstat (limited to 'include/linux/pm.h')
-rw-r--r-- | include/linux/pm.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index a84118911ced..1abfe84f447d 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
@@ -559,7 +559,7 @@ extern void __suspend_report_result(const char *function, void *fn, int ret); | |||
559 | __suspend_report_result(__func__, fn, ret); \ | 559 | __suspend_report_result(__func__, fn, ret); \ |
560 | } while (0) | 560 | } while (0) |
561 | 561 | ||
562 | extern void device_pm_wait_for_dev(struct device *sub, struct device *dev); | 562 | extern int device_pm_wait_for_dev(struct device *sub, struct device *dev); |
563 | #else /* !CONFIG_PM_SLEEP */ | 563 | #else /* !CONFIG_PM_SLEEP */ |
564 | 564 | ||
565 | #define device_pm_lock() do {} while (0) | 565 | #define device_pm_lock() do {} while (0) |
@@ -572,7 +572,10 @@ static inline int dpm_suspend_start(pm_message_t state) | |||
572 | 572 | ||
573 | #define suspend_report_result(fn, ret) do {} while (0) | 573 | #define suspend_report_result(fn, ret) do {} while (0) |
574 | 574 | ||
575 | static inline void device_pm_wait_for_dev(struct device *a, struct device *b) {} | 575 | static inline int device_pm_wait_for_dev(struct device *a, struct device *b) |
576 | { | ||
577 | return 0; | ||
578 | } | ||
576 | #endif /* !CONFIG_PM_SLEEP */ | 579 | #endif /* !CONFIG_PM_SLEEP */ |
577 | 580 | ||
578 | /* How to reorder dpm_list after device_move() */ | 581 | /* How to reorder dpm_list after device_move() */ |