Commit ab3bfca7 authored by Johannes Berg's avatar Johannes Berg Committed by Linus Torvalds

remove software_suspend()

Remove software_suspend() and all its users since
pm_suspend(PM_SUSPEND_DISK) should be equivalent and there's no point in
having two interfaces for the same thing.

The patch also changes the valid_state function to return 0 (false) for
PM_SUSPEND_DISK when SOFTWARE_SUSPEND is not configured instead of
accepting it and having the whole thing fail later.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatar"Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b1296cc4
...@@ -60,7 +60,7 @@ acpi_system_write_sleep(struct file *file, ...@@ -60,7 +60,7 @@ acpi_system_write_sleep(struct file *file,
state = simple_strtoul(str, NULL, 0); state = simple_strtoul(str, NULL, 0);
#ifdef CONFIG_SOFTWARE_SUSPEND #ifdef CONFIG_SOFTWARE_SUSPEND
if (state == 4) { if (state == 4) {
error = software_suspend(); error = pm_suspend(PM_SUSPEND_DISK);
goto Done; goto Done;
} }
#endif #endif
......
...@@ -351,8 +351,10 @@ static void tps65010_interrupt(struct tps65010 *tps) ...@@ -351,8 +351,10 @@ static void tps65010_interrupt(struct tps65010 *tps)
#if 0 #if 0
/* REVISIT: this might need its own workqueue /* REVISIT: this might need its own workqueue
* plus tweaks including deadlock avoidance ... * plus tweaks including deadlock avoidance ...
* also needs to get error handling and probably
* an #ifdef CONFIG_SOFTWARE_SUSPEND
*/ */
software_suspend(); pm_suspend(PM_SUSPEND_DISK);
#endif #endif
poll = 1; poll = 1;
} }
......
...@@ -233,7 +233,7 @@ void __init parse_early_param(void); ...@@ -233,7 +233,7 @@ void __init parse_early_param(void);
#define __obsolete_setup(str) /* nothing */ #define __obsolete_setup(str) /* nothing */
#endif #endif
/* Data marked not to be saved by software_suspend() */ /* Data marked not to be saved by software suspend */
#define __nosavedata __attribute__ ((__section__ (".data.nosave"))) #define __nosavedata __attribute__ ((__section__ (".data.nosave")))
/* This means "can be init if no module support, otherwise module load /* This means "can be init if no module support, otherwise module load
......
...@@ -33,8 +33,6 @@ static inline void pm_restore_console(void) {} ...@@ -33,8 +33,6 @@ static inline void pm_restore_console(void) {}
#endif #endif
#if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND) #if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND)
/* kernel/power/swsusp.c */
extern int software_suspend(void);
/* kernel/power/snapshot.c */ /* kernel/power/snapshot.c */
extern void __init register_nosave_region(unsigned long, unsigned long); extern void __init register_nosave_region(unsigned long, unsigned long);
extern int swsusp_page_is_forbidden(struct page *); extern int swsusp_page_is_forbidden(struct page *);
...@@ -42,12 +40,6 @@ extern void swsusp_set_page_free(struct page *); ...@@ -42,12 +40,6 @@ extern void swsusp_set_page_free(struct page *);
extern void swsusp_unset_page_free(struct page *); extern void swsusp_unset_page_free(struct page *);
extern unsigned long get_safe_page(gfp_t gfp_mask); extern unsigned long get_safe_page(gfp_t gfp_mask);
#else #else
static inline int software_suspend(void)
{
printk("Warning: fake suspend called\n");
return -ENOSYS;
}
static inline void register_nosave_region(unsigned long b, unsigned long e) {} static inline void register_nosave_region(unsigned long b, unsigned long e) {}
static inline int swsusp_page_is_forbidden(struct page *p) { return 0; } static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
static inline void swsusp_set_page_free(struct page *p) {} static inline void swsusp_set_page_free(struct page *p) {}
......
...@@ -184,17 +184,21 @@ static void suspend_finish(suspend_state_t state) ...@@ -184,17 +184,21 @@ static void suspend_finish(suspend_state_t state)
static const char * const pm_states[PM_SUSPEND_MAX] = { static const char * const pm_states[PM_SUSPEND_MAX] = {
[PM_SUSPEND_STANDBY] = "standby", [PM_SUSPEND_STANDBY] = "standby",
[PM_SUSPEND_MEM] = "mem", [PM_SUSPEND_MEM] = "mem",
#ifdef CONFIG_SOFTWARE_SUSPEND
[PM_SUSPEND_DISK] = "disk", [PM_SUSPEND_DISK] = "disk",
#endif
}; };
static inline int valid_state(suspend_state_t state) static inline int valid_state(suspend_state_t state)
{ {
/* Suspend-to-disk does not really need low-level support. /* Suspend-to-disk does not really need low-level support.
* It can work with reboot if needed. */ * It can work with shutdown/reboot if needed. If it isn't
* configured, then it cannot be supported.
*/
if (state == PM_SUSPEND_DISK) if (state == PM_SUSPEND_DISK)
#ifdef CONFIG_SOFTWARE_SUSPEND
return 1; return 1;
#else
return 0;
#endif
/* all other states need lowlevel support and need to be /* all other states need lowlevel support and need to be
* valid to the lowlevel implementation, no valid callback * valid to the lowlevel implementation, no valid callback
...@@ -244,17 +248,6 @@ static int enter_state(suspend_state_t state) ...@@ -244,17 +248,6 @@ static int enter_state(suspend_state_t state)
return error; return error;
} }
#ifdef CONFIG_SOFTWARE_SUSPEND
/*
* This is main interface to the outside world. It needs to be
* called from process context.
*/
int software_suspend(void)
{
return enter_state(PM_SUSPEND_DISK);
}
#endif
/** /**
* pm_suspend - Externally visible function for suspending system. * pm_suspend - Externally visible function for suspending system.
......
...@@ -881,7 +881,7 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user ...@@ -881,7 +881,7 @@ asmlinkage long sys_reboot(int magic1, int magic2, unsigned int cmd, void __user
#ifdef CONFIG_SOFTWARE_SUSPEND #ifdef CONFIG_SOFTWARE_SUSPEND
case LINUX_REBOOT_CMD_SW_SUSPEND: case LINUX_REBOOT_CMD_SW_SUSPEND:
{ {
int ret = software_suspend(); int ret = pm_suspend(PM_SUSPEND_DISK);
unlock_kernel(); unlock_kernel();
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment