[PATCH] PM / Hibernation: Refactor and simplify hibernation_snapshot() code

[PATCH] PM / Hibernation: Refactor and simplify hibernation_snapshot() code

[Srivatsa S. Bhat]

The goto statements in hibernation_snapshot() are a bit complex.
Refactor the code to remove some of them, thereby simplifying the
implementation.

Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
---
This is on top of the patch posted at https://lkml.org/lkml/2011/11/21/498

 kernel/power/hibernate.c |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index a6b0503..ebf62c3 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -333,7 +333,7 @@ static int create_image(int platform_mode)
  */
 int hibernation_snapshot(int platform_mode)
 {
-	pm_message_t msg = PMSG_RECOVER;
+	pm_message_t msg;
 	int error;
 
 	error = platform_begin(platform_mode);
@@ -362,26 +362,26 @@ int hibernation_snapshot(int platform_mode)
 
 	error = dpm_prepare(PMSG_FREEZE);
 	if (error) {
-		dpm_complete(msg);
+		dpm_complete(PMSG_RECOVER);
 		goto Cleanup;
 	}
 
 	suspend_console();
 	pm_restrict_gfp_mask();
+
 	error = dpm_suspend(PMSG_FREEZE);
-	if (error)
-		goto Recover_platform;
 
-	if (hibernation_test(TEST_DEVICES))
-		goto Recover_platform;
+	if (error || hibernation_test(TEST_DEVICES))
+		platform_recover(platform_mode);
+	else
+		error = create_image(platform_mode);
 
-	error = create_image(platform_mode);
 	/*
-	 * Control returns here (1) after the image has been created or the
+	 * In the case that we call create_image() above, the control
+	 * returns here (1) after the image has been created or the
 	 * image creation has failed and (2) after a successful restore.
 	 */
 
- Resume_devices:
 	/* We may need to release the preallocated image pages here. */
 	if (error || !in_suspend)
 		swsusp_free();
@@ -399,10 +399,6 @@ int hibernation_snapshot(int platform_mode)
 	platform_end(platform_mode);
 	return error;
 
- Recover_platform:
-	platform_recover(platform_mode);
-	goto Resume_devices;
-
  Cleanup:
 	swsusp_free();
 	goto Close;

Re: [PATCH] PM / Hibernation: Refactor and simplify hibernation_snapshot() code

[Rafael J. Wysocki]

On Tuesday, November 22, 2011, Srivatsa S. Bhat wrote:
> The goto statements in hibernation_snapshot() are a bit complex.
> Refactor the code to remove some of them, thereby simplifying the
> implementation.
> 
> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>

Applied to linux-pm/linux-next.

Thanks,
Rafael


> ---
> This is on top of the patch posted at https://lkml.org/lkml/2011/11/21/498
> 
>  kernel/power/hibernate.c |   22 +++++++++-------------
>  1 files changed, 9 insertions(+), 13 deletions(-)
> 
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index a6b0503..ebf62c3 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -333,7 +333,7 @@ static int create_image(int platform_mode)
>   */
>  int hibernation_snapshot(int platform_mode)
>  {
> -	pm_message_t msg = PMSG_RECOVER;
> +	pm_message_t msg;
>  	int error;
>  
>  	error = platform_begin(platform_mode);
> @@ -362,26 +362,26 @@ int hibernation_snapshot(int platform_mode)
>  
>  	error = dpm_prepare(PMSG_FREEZE);
>  	if (error) {
> -		dpm_complete(msg);
> +		dpm_complete(PMSG_RECOVER);
>  		goto Cleanup;
>  	}
>  
>  	suspend_console();
>  	pm_restrict_gfp_mask();
> +
>  	error = dpm_suspend(PMSG_FREEZE);
> -	if (error)
> -		goto Recover_platform;
>  
> -	if (hibernation_test(TEST_DEVICES))
> -		goto Recover_platform;
> +	if (error || hibernation_test(TEST_DEVICES))
> +		platform_recover(platform_mode);
> +	else
> +		error = create_image(platform_mode);
>  
> -	error = create_image(platform_mode);
>  	/*
> -	 * Control returns here (1) after the image has been created or the
> +	 * In the case that we call create_image() above, the control
> +	 * returns here (1) after the image has been created or the
>  	 * image creation has failed and (2) after a successful restore.
>  	 */
>  
> - Resume_devices:
>  	/* We may need to release the preallocated image pages here. */
>  	if (error || !in_suspend)
>  		swsusp_free();
> @@ -399,10 +399,6 @@ int hibernation_snapshot(int platform_mode)
>  	platform_end(platform_mode);
>  	return error;
>  
> - Recover_platform:
> -	platform_recover(platform_mode);
> -	goto Resume_devices;
> -
>   Cleanup:
>  	swsusp_free();
>  	goto Close;
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 

Re: [PATCH] PM / Hibernation: Refactor and simplify hibernation_snapshot() code

[Pavel Machek]

On Wed 2011-11-23 02:55:40, Srivatsa S. Bhat wrote:
> The goto statements in hibernation_snapshot() are a bit complex.
> Refactor the code to remove some of them, thereby simplifying the
> implementation.
> 
> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>

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