* [PATCH] PM/Suspend: Avoid code duplication in suspend statistics update
@ 2012-02-02 1:39 Marcos Paulo de Souza
2012-02-02 1:50 ` Srivatsa S. Bhat
0 siblings, 1 reply; 3+ messages in thread
From: Marcos Paulo de Souza @ 2012-02-02 1:39 UTC (permalink / raw)
To: len.brown
Cc: pavel, rjw, linux-pm, srivatsa.bhat, linux-kernel, Marcos Paulo de Souza
The code
if (error) {
suspend_stats.fail++;
dpm_save_failed_errno(error);
} else
suspend_stats.success++;
Appears in the kernel/power/main.c and kernel/power/suspend.c.
This patch just creates a new function to avoid duplicated code.
Suggested-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
---
include/linux/suspend.h | 16 ++++++++++++++++
kernel/power/main.c | 6 +-----
kernel/power/suspend.c | 6 +-----
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 91784a4..313fef1 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -91,6 +91,22 @@ static inline void dpm_save_failed_step(enum suspend_stat_step 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.
*
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 9824b41e..83947af 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -292,11 +292,7 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr,
}
if (state < PM_SUSPEND_MAX && *s) {
error = enter_state(state);
- if (error) {
- suspend_stats.fail++;
- dpm_save_failed_errno(error);
- } else
- suspend_stats.success++;
+ suspend_stats_update(error);
}
#endif
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 4fd51be..7fd84b5 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -321,11 +321,7 @@ int pm_suspend(suspend_state_t state)
int ret;
if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX) {
ret = enter_state(state);
- if (ret) {
- suspend_stats.fail++;
- dpm_save_failed_errno(ret);
- } else
- suspend_stats.success++;
+ suspend_stats_update(ret);
return ret;
}
return -EINVAL;
--
1.7.7.6
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] PM/Suspend: Avoid code duplication in suspend statistics update
2012-02-02 1:39 [PATCH] PM/Suspend: Avoid code duplication in suspend statistics update Marcos Paulo de Souza
@ 2012-02-02 1:50 ` Srivatsa S. Bhat
2012-02-02 19:37 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Srivatsa S. Bhat @ 2012-02-02 1:50 UTC (permalink / raw)
To: Marcos Paulo de Souza; +Cc: len.brown, pavel, rjw, linux-pm, linux-kernel
On 02/02/2012 07:09 AM, Marcos Paulo de Souza wrote:
> The code
> if (error) {
> suspend_stats.fail++;
> dpm_save_failed_errno(error);
> } else
> suspend_stats.success++;
>
> Appears in the kernel/power/main.c and kernel/power/suspend.c.
>
> This patch just creates a new function to avoid duplicated code.
>
> Suggested-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
> Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
> ---
Looks good to me :-)
Acked-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Regards,
Srivatsa S. Bhat
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] PM/Suspend: Avoid code duplication in suspend statistics update
2012-02-02 1:50 ` Srivatsa S. Bhat
@ 2012-02-02 19:37 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2012-02-02 19:37 UTC (permalink / raw)
To: Srivatsa S. Bhat
Cc: Marcos Paulo de Souza, len.brown, pavel, linux-pm, linux-kernel
On Thursday, February 02, 2012, Srivatsa S. Bhat wrote:
> On 02/02/2012 07:09 AM, Marcos Paulo de Souza wrote:
>
> > The code
> > if (error) {
> > suspend_stats.fail++;
> > dpm_save_failed_errno(error);
> > } else
> > suspend_stats.success++;
> >
> > Appears in the kernel/power/main.c and kernel/power/suspend.c.
> >
> > This patch just creates a new function to avoid duplicated code.
> >
> > Suggested-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
> > Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
> > ---
>
>
> Looks good to me :-)
>
> Acked-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Applied.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-02 19:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-02 1:39 [PATCH] PM/Suspend: Avoid code duplication in suspend statistics update Marcos Paulo de Souza
2012-02-02 1:50 ` Srivatsa S. Bhat
2012-02-02 19:37 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).