2022-12-06 08:20:20

by ye.xingchen

Subject: [PATCH] cpufreq: stats: Convert to use sysfs_emit_at() API

From: ye xingchen <[email protected]>

Follow the advice of the Documentation/filesystems/sysfs.rst and show()
should only use sysfs_emit() or sysfs_emit_at() when formatting the
value to be returned to user space.

Signed-off-by: ye xingchen <[email protected]>
---
drivers/cpufreq/cpufreq_stats.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 1570d6f3e75d..55c7ffd37d1c 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -128,25 +128,23 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)
ssize_t len = 0;
int i, j, count;

- len += scnprintf(buf + len, PAGE_SIZE - len, " From : To\n");
- len += scnprintf(buf + len, PAGE_SIZE - len, " : ");
+ len += sysfs_emit_at(buf, len, " From : To\n");
+ len += sysfs_emit_at(buf, len, " : ");
for (i = 0; i < stats->state_num; i++) {
if (len >= PAGE_SIZE)
break;
- len += scnprintf(buf + len, PAGE_SIZE - len, "%9u ",
- stats->freq_table[i]);
+ len += sysfs_emit_at(buf, len, "%9u ", stats->freq_table[i]);
}
if (len >= PAGE_SIZE)
return PAGE_SIZE;

- len += scnprintf(buf + len, PAGE_SIZE - len, "\n");
+ len += sysfs_emit_at(buf, len, "\n");

for (i = 0; i < stats->state_num; i++) {
if (len >= PAGE_SIZE)
break;

- len += scnprintf(buf + len, PAGE_SIZE - len, "%9u: ",
- stats->freq_table[i]);
+ len += sysfs_emit_at(buf, len, "%9u: ", stats->freq_table[i]);

for (j = 0; j < stats->state_num; j++) {
if (len >= PAGE_SIZE)
@@ -157,11 +155,11 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)
else
count = stats->trans_table[i * stats->max_state + j];

- len += scnprintf(buf + len, PAGE_SIZE - len, "%9u ", count);
+ len += sysfs_emit_at(buf, len, "%9u ", count);
}
if (len >= PAGE_SIZE)
break;
- len += scnprintf(buf + len, PAGE_SIZE - len, "\n");
+ len += sysfs_emit_at(buf, len, "\n");
}

if (len >= PAGE_SIZE) {
--
2.25.1

2022-12-06 09:42:13

by Viresh Kumar

Subject: Re: [PATCH] cpufreq: stats: Convert to use sysfs_emit_at() API

On 06-12-22, 16:15, [email protected] wrote:
> From: ye xingchen <[email protected]>
>
> Follow the advice of the Documentation/filesystems/sysfs.rst and show()
> should only use sysfs_emit() or sysfs_emit_at() when formatting the
> value to be returned to user space.
>
> Signed-off-by: ye xingchen <[email protected]>
> ---
> drivers/cpufreq/cpufreq_stats.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
> index 1570d6f3e75d..55c7ffd37d1c 100644
> --- a/drivers/cpufreq/cpufreq_stats.c
> +++ b/drivers/cpufreq/cpufreq_stats.c
> @@ -128,25 +128,23 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)
> ssize_t len = 0;
> int i, j, count;
>
> - len += scnprintf(buf + len, PAGE_SIZE - len, " From : To\n");
> - len += scnprintf(buf + len, PAGE_SIZE - len, " : ");
> + len += sysfs_emit_at(buf, len, " From : To\n");
> + len += sysfs_emit_at(buf, len, " : ");
> for (i = 0; i < stats->state_num; i++) {
> if (len >= PAGE_SIZE)
> break;
> - len += scnprintf(buf + len, PAGE_SIZE - len, "%9u ",
> - stats->freq_table[i]);
> + len += sysfs_emit_at(buf, len, "%9u ", stats->freq_table[i]);
> }
> if (len >= PAGE_SIZE)
> return PAGE_SIZE;
>
> - len += scnprintf(buf + len, PAGE_SIZE - len, "\n");
> + len += sysfs_emit_at(buf, len, "\n");
>
> for (i = 0; i < stats->state_num; i++) {
> if (len >= PAGE_SIZE)
> break;
>
> - len += scnprintf(buf + len, PAGE_SIZE - len, "%9u: ",
> - stats->freq_table[i]);
> + len += sysfs_emit_at(buf, len, "%9u: ", stats->freq_table[i]);
>
> for (j = 0; j < stats->state_num; j++) {
> if (len >= PAGE_SIZE)
> @@ -157,11 +155,11 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)
> else
> count = stats->trans_table[i * stats->max_state + j];
>
> - len += scnprintf(buf + len, PAGE_SIZE - len, "%9u ", count);
> + len += sysfs_emit_at(buf, len, "%9u ", count);
> }
> if (len >= PAGE_SIZE)
> break;
> - len += scnprintf(buf + len, PAGE_SIZE - len, "\n");
> + len += sysfs_emit_at(buf, len, "\n");
> }
>
> if (len >= PAGE_SIZE) {

Acked-by: Viresh Kumar <[email protected]>

--
viresh

2022-12-06 11:57:56

by Rafael J. Wysocki

Subject: Re: [PATCH] cpufreq: stats: Convert to use sysfs_emit_at() API

On Tue, Dec 6, 2022 at 9:46 AM Viresh Kumar <[email protected]> wrote:
>
> On 06-12-22, 16:15, [email protected] wrote:
> > From: ye xingchen <[email protected]>
> >
> > Follow the advice of the Documentation/filesystems/sysfs.rst and show()
> > should only use sysfs_emit() or sysfs_emit_at() when formatting the
> > value to be returned to user space.
> >
> > Signed-off-by: ye xingchen <[email protected]>
> > ---
> > drivers/cpufreq/cpufreq_stats.c | 16 +++++++---------
> > 1 file changed, 7 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
> > index 1570d6f3e75d..55c7ffd37d1c 100644
> > --- a/drivers/cpufreq/cpufreq_stats.c
> > +++ b/drivers/cpufreq/cpufreq_stats.c
> > @@ -128,25 +128,23 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)
> > ssize_t len = 0;
> > int i, j, count;
> >
> > - len += scnprintf(buf + len, PAGE_SIZE - len, " From : To\n");
> > - len += scnprintf(buf + len, PAGE_SIZE - len, " : ");
> > + len += sysfs_emit_at(buf, len, " From : To\n");
> > + len += sysfs_emit_at(buf, len, " : ");
> > for (i = 0; i < stats->state_num; i++) {
> > if (len >= PAGE_SIZE)
> > break;
> > - len += scnprintf(buf + len, PAGE_SIZE - len, "%9u ",
> > - stats->freq_table[i]);
> > + len += sysfs_emit_at(buf, len, "%9u ", stats->freq_table[i]);
> > }
> > if (len >= PAGE_SIZE)
> > return PAGE_SIZE;
> >
> > - len += scnprintf(buf + len, PAGE_SIZE - len, "\n");
> > + len += sysfs_emit_at(buf, len, "\n");
> >
> > for (i = 0; i < stats->state_num; i++) {
> > if (len >= PAGE_SIZE)
> > break;
> >
> > - len += scnprintf(buf + len, PAGE_SIZE - len, "%9u: ",
> > - stats->freq_table[i]);
> > + len += sysfs_emit_at(buf, len, "%9u: ", stats->freq_table[i]);
> >
> > for (j = 0; j < stats->state_num; j++) {
> > if (len >= PAGE_SIZE)
> > @@ -157,11 +155,11 @@ static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)
> > else
> > count = stats->trans_table[i * stats->max_state + j];
> >
> > - len += scnprintf(buf + len, PAGE_SIZE - len, "%9u ", count);
> > + len += sysfs_emit_at(buf, len, "%9u ", count);
> > }
> > if (len >= PAGE_SIZE)
> > break;
> > - len += scnprintf(buf + len, PAGE_SIZE - len, "\n");
> > + len += sysfs_emit_at(buf, len, "\n");
> > }
> >
> > if (len >= PAGE_SIZE) {
>
> Acked-by: Viresh Kumar <[email protected]>
>
> --

Applied as 6.2 material, thanks!