From: Mario Limonciello <[email protected]> All consumers in the kernel of pm_hibernate_is_recovering() and pm_hibernation_mode_is_suspend() have been dropped. Remove the symbols.
Signed-off-by: Mario Limonciello <[email protected]> --- drivers/base/power/main.c | 14 -------------- include/linux/suspend.h | 8 -------- kernel/power/hibernate.c | 11 ----------- 3 files changed, 33 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 58f5270a173e8..e2f23e62abb18 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -62,20 +62,6 @@ static pm_message_t pm_transition; static DEFINE_MUTEX(async_wip_mtx); static int async_error; -/** - * pm_hibernate_is_recovering - if recovering from hibernate due to error. - * - * Used to query if dev_pm_ops.thaw() is called for normal hibernation case or - * recovering from some error. - * - * Return: true for error case, false for normal case. - */ -bool pm_hibernate_is_recovering(void) -{ - return pm_transition.event == PM_EVENT_RECOVER; -} -EXPORT_SYMBOL_GPL(pm_hibernate_is_recovering); - static const char *pm_verb(int event) { switch (event) { diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 348831cdb60e4..f305fcc7a2cdc 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -420,12 +420,6 @@ static inline int hibernate_quiet_exec(int (*func)(void *data), void *data) { } #endif /* CONFIG_HIBERNATION */ -#if defined(CONFIG_HIBERNATION) && defined(CONFIG_SUSPEND) -bool pm_hibernation_mode_is_suspend(void); -#else -static inline bool pm_hibernation_mode_is_suspend(void) { return false; } -#endif - int arch_resume_nosmt(void); #ifdef CONFIG_HIBERNATION_SNAPSHOT_DEV @@ -486,7 +480,6 @@ extern unsigned int lock_system_sleep(void); extern void unlock_system_sleep(unsigned int); extern bool pm_sleep_transition_in_progress(void); -bool pm_hibernate_is_recovering(void); #else /* !CONFIG_PM_SLEEP */ @@ -520,7 +513,6 @@ static inline unsigned int lock_system_sleep(void) { return 0; } static inline void unlock_system_sleep(unsigned int flags) {} static inline bool pm_sleep_transition_in_progress(void) { return false; } -static inline bool pm_hibernate_is_recovering(void) { return false; } #endif /* !CONFIG_PM_SLEEP */ diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 7af2e392c574a..ec02a8be20b30 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -80,17 +80,6 @@ static const struct platform_hibernation_ops *hibernation_ops; static atomic_t hibernate_atomic = ATOMIC_INIT(1); -#ifdef CONFIG_SUSPEND -/** - * pm_hibernation_mode_is_suspend - Check if hibernation has been set to suspend - */ -bool pm_hibernation_mode_is_suspend(void) -{ - return hibernation_mode == HIBERNATION_SUSPEND; -} -EXPORT_SYMBOL_GPL(pm_hibernation_mode_is_suspend); -#endif - bool hibernate_acquire(void) { return atomic_add_unless(&hibernate_atomic, -1, 0); -- 2.43.0
