Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/acpi/sleep/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ acpi_system_write_sleep(struct file *file, 
	state = simple_strtoul(str, NULL, 0);

#ifdef CONFIG_SOFTWARE_SUSPEND

	if (state == 4) {

		error = software_suspend();

		error = pm_suspend(PM_SUSPEND_DISK);

		goto Done;

	}

#endif

drivers/i2c/chips/tps65010.c

+3 −1
Original line number Diff line number Diff line
@@ -351,8 +351,10 @@ static void tps65010_interrupt(struct tps65010 *tps) 
#if 0

			/* REVISIT:  this might need its own workqueue

			 * 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

			poll = 1;

		}

include/linux/init.h

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ void __init parse_early_param(void); 
#define __obsolete_setup(str) 			/* nothing */

#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")))



/* This means "can be init if no module support, otherwise module load

include/linux/suspend.h

+0 −8
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ static inline void pm_restore_console(void) {} 
#endif



#if defined(CONFIG_PM) && defined(CONFIG_SOFTWARE_SUSPEND)

/* kernel/power/swsusp.c */

extern int software_suspend(void);

/* kernel/power/snapshot.c */

extern void __init register_nosave_region(unsigned long, unsigned long);

extern int swsusp_page_is_forbidden(struct page *);
@@ -42,12 +40,6 @@ extern void swsusp_set_page_free(struct page *); 
extern void swsusp_unset_page_free(struct page *);

extern unsigned long get_safe_page(gfp_t gfp_mask);

#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 int swsusp_page_is_forbidden(struct page *p) { return 0; }

static inline void swsusp_set_page_free(struct page *p) {}

kernel/power/main.c

+7 −14
Original line number Diff line number Diff line
@@ -184,17 +184,21 @@ static void suspend_finish(suspend_state_t state) 
static const char * const pm_states[PM_SUSPEND_MAX] = {

	[PM_SUSPEND_STANDBY]	= "standby",

	[PM_SUSPEND_MEM]	= "mem",

#ifdef CONFIG_SOFTWARE_SUSPEND

	[PM_SUSPEND_DISK]	= "disk",

#endif

};



static inline int valid_state(suspend_state_t state)

{

	/* 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)

#ifdef CONFIG_SOFTWARE_SUSPEND

		return 1;

#else

		return 0;

#endif



	/* all other states need lowlevel support and need to be

	 * valid to the lowlevel implementation, no valid callback
@@ -244,17 +248,6 @@ static int enter_state(suspend_state_t state) 
	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.