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

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

rework pm_ops pm_disk_mode, kill misuse 



This patch series cleans up some misconceptions about pm_ops.  Some users of
the pm_ops structure attempt to use it to stop the user from entering suspend
to disk, this, however, is not possible since the user can always use
"shutdown" in /sys/power/disk and then the pm_ops are never invoked.  Also,
platforms that don't support suspend to disk simply should not allow
configuring SOFTWARE_SUSPEND (read the help text on it, it only selects
suspend to disk and nothing else, all the other stuff depends on PM).

The pm_ops structure is actually intended to provide a way to enter
platform-defined sleep states (currently supported states are "standby" and
"mem" (suspend to ram)) and additionally (if SOFTWARE_SUSPEND is configured)
allows a platform to support a platform specific way to enter low-power mode
once everything has been saved to disk.  This is currently only used by ACPI
(S4).

This patch:

The pm_ops.pm_disk_mode is used in totally bogus ways since nobody really
seems to understand what it actually does.

This patch clarifies the pm_disk_mode description.

It also removes all the arm and sh users that think they can veto suspend to
disk via pm_ops; not so since the user can always do echo shutdown >
/sys/power/disk, they need to find a better way involving Kconfig or such.

ACPI is the only user left with a non-zero pm_disk_mode.

The patch also sets the default mode to shutdown again, but when a new pm_ops
is registered its pm_disk_mode is selected as default, that way the default
stays for ACPI where it is apparently required.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Cc: David Brownell <david-b@pacbell.net>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Cc: <linux-pm@lists.linux-foundation.org>
Cc: Len Brown <lenb@kernel.org>
Acked-by: default avatarRussell King <rmk@arm.linux.org.uk>
Cc: Greg KH <greg@kroah.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1173a729

arch/arm/common/sharpsl_pm.c

+0 −1
Original line number Diff line number Diff line
@@ -766,7 +766,6 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info) 
}



static struct pm_ops sharpsl_pm_ops = {

	.pm_disk_mode	= PM_DISK_FIRMWARE,

	.prepare	= pxa_pm_prepare,

	.enter		= corgi_pxa_pm_enter,

	.finish		= pxa_pm_finish,

arch/arm/mach-at91/pm.c

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ static int at91_pm_enter(suspend_state_t state) 




static struct pm_ops at91_pm_ops ={

	.pm_disk_mode	= 0,

	.valid		= at91_pm_valid_state,

	.prepare	= at91_pm_prepare,

	.enter		= at91_pm_enter,

arch/arm/mach-omap1/pm.c

+0 −1
Original line number Diff line number Diff line
@@ -698,7 +698,6 @@ static struct irqaction omap_wakeup_irq = { 




static struct pm_ops omap_pm_ops ={

	.pm_disk_mode	= 0,

	.prepare	= omap_pm_prepare,

	.enter		= omap_pm_enter,

	.finish		= omap_pm_finish,

arch/arm/mach-omap2/pm.c

+0 −1
Original line number Diff line number Diff line
@@ -370,7 +370,6 @@ static int omap2_pm_finish(suspend_state_t state) 
}



static struct pm_ops omap_pm_ops = {

	.pm_disk_mode	= 0,

	.prepare	= omap2_pm_prepare,

	.enter		= omap2_pm_enter,

	.finish		= omap2_pm_finish,

arch/arm/mach-pxa/pm.c

+0 −4
Original line number Diff line number Diff line
@@ -223,11 +223,7 @@ int pxa_pm_finish(suspend_state_t state) 


EXPORT_SYMBOL_GPL(pxa_pm_finish);



/*

 * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.

 */

static struct pm_ops pxa_pm_ops = {

	.pm_disk_mode	= PM_DISK_FIRMWARE,

	.prepare	= pxa_pm_prepare,

	.enter		= pxa_pm_enter,

	.finish		= pxa_pm_finish,