2019-12-09 09:44:48

by zhuguangqing83

[permalink] [raw]
Subject: [PATCH v2]PM/wakeup: Add print_wakeup_source_stats(m, &deleted_ws)

From: zhuguangqing <[email protected]>

After commit 00ee22c28915 (PM / wakeup: Use seq_open()
to show wakeup stats), print_wakeup_source_stats(m, &deleted_ws)
is deleted in function wakeup_sources_stats_seq_show().

Because deleted_ws is one of wakeup sources, so it should
also be showed. This patch add it to the end of all other
wakeup sources.

Signed-off-by: zhuguangqing <[email protected]>
---
v2: modify judegment condition according to the advice of Rafael J.

drivers/base/power/wakeup.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index 5817b51d2b15..53c0519da1e4 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -1071,6 +1071,9 @@ static void *wakeup_sources_stats_seq_next(struct seq_file *m,
break;
}

+ if (!next_ws)
+ print_wakeup_source_stats(m, &deleted_ws);
+
return next_ws;
}

--
2.17.1


2019-12-20 09:21:37

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: [PATCH v2]PM/wakeup: Add print_wakeup_source_stats(m, &deleted_ws)

On Monday, December 9, 2019 10:35:23 AM CET [email protected] wrote:
> From: zhuguangqing <[email protected]>
>
> After commit 00ee22c28915 (PM / wakeup: Use seq_open()
> to show wakeup stats), print_wakeup_source_stats(m, &deleted_ws)
> is deleted in function wakeup_sources_stats_seq_show().
>
> Because deleted_ws is one of wakeup sources, so it should
> also be showed. This patch add it to the end of all other
> wakeup sources.
>
> Signed-off-by: zhuguangqing <[email protected]>
> ---
> v2: modify judegment condition according to the advice of Rafael J.
>
> drivers/base/power/wakeup.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
> index 5817b51d2b15..53c0519da1e4 100644
> --- a/drivers/base/power/wakeup.c
> +++ b/drivers/base/power/wakeup.c
> @@ -1071,6 +1071,9 @@ static void *wakeup_sources_stats_seq_next(struct seq_file *m,
> break;
> }
>
> + if (!next_ws)
> + print_wakeup_source_stats(m, &deleted_ws);
> +
> return next_ws;
> }
>
>

Applied as 5.6 material with some subject and changelog modifications, thanks!