Re: [PATCH 4/6] ACPI / PM: Call acpi_save_state_mem() right before low-level suspend

[Pavel Machek <pavel@ucw.cz>]

On Mon 2011-02-07 23:20:53, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rjw@sisk.pl>
> 
> Since acpi_save_state_mem() is only called by acpi_suspend_enter()
> if the target sleep state is S3, it's better to call it under the
> switch (acpi_state), right before do_suspend_lowlevel().

ack.

> 
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---
>  drivers/acpi/sleep.c |   12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> Index: linux-2.6/drivers/acpi/sleep.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/sleep.c
> +++ linux-2.6/drivers/acpi/sleep.c
> @@ -244,17 +244,10 @@ static int acpi_suspend_enter(suspend_st
>  {
>  	acpi_status status = AE_OK;
>  	u32 acpi_state = acpi_target_sleep_state;
> +	int error;
>  
>  	ACPI_FLUSH_CPU_CACHE();
>  
> -	/* Do arch specific saving of state. */
> -	if (acpi_state == ACPI_STATE_S3) {
> -		int error = acpi_save_state_mem();
> -
> -		if (error)
> -			return error;
> -	}
> -
>  	switch (acpi_state) {
>  	case ACPI_STATE_S1:
>  		barrier();
> @@ -262,6 +255,9 @@ static int acpi_suspend_enter(suspend_st
>  		break;
>  
>  	case ACPI_STATE_S3:
> +		error = acpi_save_state_mem();
> +		if (error)
> +			return error;
>  		do_suspend_lowlevel();
>  		pr_info(PREFIX "Low-level resume complete\n");
>  		break;
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html