Linux-libre 4.8.2-gnupck-4.8.2-gnu

1 files changed, 2 insertions, 71 deletions

diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 0e527a70e..7693e39b1 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -18,12 +18,11 @@ static inline void pm_set_vt_switch(int do_switch)
 #endif
 
 #ifdef CONFIG_VT_CONSOLE_SLEEP
-extern int pm_prepare_console(void);
+extern void pm_prepare_console(void);
 extern void pm_restore_console(void);
 #else
-static inline int pm_prepare_console(void)
+static inline void pm_prepare_console(void)
 {
-	return 0;
 }
 
 static inline void pm_restore_console(void)
@@ -491,74 +490,6 @@ extern bool pm_print_times_enabled;
 #define pm_print_times_enabled	(false)
 #endif
 
-enum {
-	TOI_CAN_HIBERNATE,
-	TOI_CAN_RESUME,
-	TOI_RESUME_DEVICE_OK,
-	TOI_NORESUME_SPECIFIED,
-	TOI_SANITY_CHECK_PROMPT,
-	TOI_CONTINUE_REQ,
-	TOI_RESUMED_BEFORE,
-	TOI_BOOT_TIME,
-	TOI_NOW_RESUMING,
-	TOI_IGNORE_LOGLEVEL,
-	TOI_TRYING_TO_RESUME,
-	TOI_LOADING_ALT_IMAGE,
-	TOI_STOP_RESUME,
-	TOI_IO_STOPPED,
-	TOI_NOTIFIERS_PREPARE,
-	TOI_CLUSTER_MODE,
-	TOI_BOOT_KERNEL,
-	TOI_DEVICE_HOTPLUG_LOCKED,
-};
-
-#ifdef CONFIG_TOI
-
-/* Used in init dir files */
-extern unsigned long toi_state;
-#define set_toi_state(bit) (set_bit(bit, &toi_state))
-#define clear_toi_state(bit) (clear_bit(bit, &toi_state))
-#define test_toi_state(bit) (test_bit(bit, &toi_state))
-extern int toi_running;
-
-#define test_action_state(bit) (test_bit(bit, &toi_bkd.toi_action))
-extern int try_tuxonice_hibernate(void);
-
-#else /* !CONFIG_TOI */
-
-#define toi_state		(0)
-#define set_toi_state(bit) do { } while (0)
-#define clear_toi_state(bit) do { } while (0)
-#define test_toi_state(bit) (0)
-#define toi_running (0)
-
-static inline int try_tuxonice_hibernate(void) { return 0; }
-#define test_action_state(bit) (0)
-
-#endif /* CONFIG_TOI */
-
-#ifdef CONFIG_HIBERNATION
-#ifdef CONFIG_TOI
-extern void try_tuxonice_resume(void);
-#else
-#define try_tuxonice_resume() do { } while (0)
-#endif
-
-extern int resume_attempted;
-extern int software_resume(void);
-
-static inline void check_resume_attempted(void)
-{
-	if (resume_attempted)
-		return;
-
-	software_resume();
-}
-#else
-#define check_resume_attempted() do { } while (0)
-#define resume_attempted (0)
-#endif
-
 #ifdef CONFIG_PM_AUTOSLEEP
 
 /* kernel/power/autosleep.c */