lkml.org 
[lkml]   [2012]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 3/3] PM / Sleep: Drop suspend_stats_update()
On 02/12/2012 04:36 AM, Rafael J. Wysocki wrote:

> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> Since suspend_stats_update() is only called from pm_suspend(),
> move its code directly into that function and remove the static
> inline definition from include/linux/suspend.h. Clean up
> pm_suspend() in the process.
>
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
> ---


Acked-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>

Regards,
Srivatsa S. Bhat

> include/linux/suspend.h | 16 ----------------
> kernel/power/suspend.c | 18 ++++++++++++------
> 2 files changed, 12 insertions(+), 22 deletions(-)
>
> Index: linux/include/linux/suspend.h
> ===================================================================
> --- linux.orig/include/linux/suspend.h
> +++ linux/include/linux/suspend.h
> @@ -95,22 +95,6 @@ static inline void dpm_save_failed_step(
> }
>
> /**
> - * suspend_stats_update - Update success/failure statistics of suspend-to-ram
> - *
> - * @error: Value returned by enter_state() function
> - */
> -static inline void suspend_stats_update(int error)
> -{
> - if (error) {
> - suspend_stats.fail++;
> - dpm_save_failed_errno(error);
> - } else {
> - suspend_stats.success++;
> - }
> -}
> -
> -
> -/**
> * struct platform_suspend_ops - Callbacks for managing platform dependent
> * system sleep states.
> *
> Index: linux/kernel/power/suspend.c
> ===================================================================
> --- linux.orig/kernel/power/suspend.c
> +++ linux/kernel/power/suspend.c
> @@ -316,12 +316,18 @@ static int enter_state(suspend_state_t s
> */
> int pm_suspend(suspend_state_t state)
> {
> - int ret;
> - if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX) {
> - ret = enter_state(state);
> - suspend_stats_update(ret);
> - return ret;
> + int error;
> +
> + if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
> + return -EINVAL;
> +
> + error = enter_state(state);
> + if (error) {
> + suspend_stats.fail++;
> + dpm_save_failed_errno(error);
> + } else {
> + suspend_stats.success++;
> }
> - return -EINVAL;
> + return error;
> }
> EXPORT_SYMBOL(pm_suspend);
>



\
 
 \ /
  Last update: 2012-02-12 15:53    [from the cache]
©2003-2011 Jasper Spaans