From e6c5eb9541f2197a3ffab90b1c7a3250a9b51bf6 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 18 Oct 2007 03:04:41 -0700 Subject: PM: Rework struct platform_suspend_ops MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no reason why the .prepare() and .finish() methods in 'struct platform_suspend_ops' should take any arguments, since architectures don't use these methods' argument in any practically meaningful way (ie. either the target system sleep state is conveyed to the platform by .set_target(), or there is only one suspend state supported and it is indicated to the PM core by .valid(), or .prepare() and .finish() aren't defined at all).  There also is no reason why .finish() should return any result. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Cc: Len Brown Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- kernel/power/main.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'kernel/power/main.c') diff --git a/kernel/power/main.c b/kernel/power/main.c index 854bf0811d40..7d09a9894947 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -58,13 +58,6 @@ int suspend_valid_only_mem(suspend_state_t state) return state == PM_SUSPEND_MEM; } - -static inline void pm_finish(suspend_state_t state) -{ - if (suspend_ops->finish) - suspend_ops->finish(state); -} - /** * suspend_prepare - Do prep work before entering low-power state. * @@ -171,7 +164,7 @@ int suspend_devices_and_enter(suspend_state_t state) goto Resume_console; } if (suspend_ops->prepare) { - error = suspend_ops->prepare(state); + error = suspend_ops->prepare(); if (error) goto Resume_devices; } @@ -180,7 +173,8 @@ int suspend_devices_and_enter(suspend_state_t state) suspend_enter(state); enable_nonboot_cpus(); - pm_finish(state); + if (suspend_ops->finish) + suspend_ops->finish(); Resume_devices: device_resume(); Resume_console: -- cgit v1.2.1