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

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

power management: implement pm_ops.valid for everybody 



Almost all users of pm_ops only support mem sleep, don't check in .valid and
don't reject any others in .prepare so users can be confused if they check
/sys/power/state, especially when new states are added (these would then
result in s-t-r although they're supposed to be something different).

This patch implements a generic pm_valid_only_mem function that is then
exported for users and puts it to use in almost all existing pm_ops.

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>
Cc: Paul 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 11d77d0c

arch/arm/common/sharpsl_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -769,6 +769,7 @@ static struct pm_ops sharpsl_pm_ops = { 
	.prepare	= pxa_pm_prepare,

	.enter		= corgi_pxa_pm_enter,

	.finish		= pxa_pm_finish,

	.valid		= pm_valid_only_mem,

};



static int __init sharpsl_pm_probe(struct platform_device *pdev)

arch/arm/mach-omap1/pm.c

+1 −0
Original line number Diff line number Diff line
@@ -701,6 +701,7 @@ static struct pm_ops omap_pm_ops ={ 
	.prepare	= omap_pm_prepare,

	.enter		= omap_pm_enter,

	.finish		= omap_pm_finish,

	.valid		= pm_valid_only_mem,

};



static int __init omap_pm_init(void)

arch/arm/mach-omap2/pm.c

+1 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ static struct pm_ops omap_pm_ops = { 
	.prepare	= omap2_pm_prepare,

	.enter		= omap2_pm_enter,

	.finish		= omap2_pm_finish,

	.valid		= pm_valid_only_mem,

};



int __init omap2_pm_init(void)

arch/arm/mach-pnx4008/pm.c

+4 −35
Original line number Diff line number Diff line
@@ -107,50 +107,19 @@ static int pnx4008_pm_enter(suspend_state_t state) 
	case PM_SUSPEND_MEM:

		pnx4008_suspend();

		break;

	case PM_SUSPEND_DISK:

		return -ENOTSUPP;

	default:

		return -EINVAL;

	}

	return 0;

}



/*

 * Called after processes are frozen, but before we shut down devices.

 */

static int pnx4008_pm_prepare(suspend_state_t state)

{

	switch (state) {

	case PM_SUSPEND_STANDBY:

	case PM_SUSPEND_MEM:

		break;



	case PM_SUSPEND_DISK:

		return -ENOTSUPP;

		break;



	default:

		return -EINVAL;

		break;

	}

	return 0;

}



/*

 * Called after devices are re-setup, but before processes are thawed.

 */

static int pnx4008_pm_finish(suspend_state_t state)

static int pnx4008_pm_valid(suspend_state_t state)

{

	return 0;

	return (state == PM_SUSPEND_STANDBY) ||

	       (state == PM_SUSPEND_MEM);

}



/*

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

 */

static struct pm_ops pnx4008_pm_ops = {

	.prepare = pnx4008_pm_prepare,

	.enter = pnx4008_pm_enter,

	.finish = pnx4008_pm_finish,

	.valid = pnx4008_pm_valid,

};



static int __init pnx4008_pm_init(void)

arch/arm/mach-pxa/pm.c

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ static struct pm_ops pxa_pm_ops = { 
	.prepare	= pxa_pm_prepare,

	.enter		= pxa_pm_enter,

	.finish		= pxa_pm_finish,

	.valid		= pm_valid_only_mem,

};



static int __init pxa_pm_init(void)