cpufreq: stats: Convert to use sysfs_emit_at() API

Message ID 202212061615227896127@zte.com.cn
State New
Headers
Series cpufreq: stats: Convert to use sysfs_emit_at() API |

Commit Message

ye.xingchen@zte.com.cn Dec. 6, 2022, 8:15 a.m. UTC
  From: ye xingchen <ye.xingchen@zte.com.cn>

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 <ye.xingchen@zte.com.cn>
---
 drivers/cpufreq/cpufreq_stats.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
  

Comments

Viresh Kumar Dec. 6, 2022, 8:45 a.m. UTC | #1
On 06-12-22, 16:15, ye.xingchen@zte.com.cn wrote:
> From: ye xingchen <ye.xingchen@zte.com.cn>
> 
> 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 <ye.xingchen@zte.com.cn>
> ---
>  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 <viresh.kumar@linaro.org>
  
Rafael J. Wysocki Dec. 6, 2022, 11:28 a.m. UTC | #2
On Tue, Dec 6, 2022 at 9:46 AM Viresh Kumar <viresh.kumar@linaro.org> wrote:
>
> On 06-12-22, 16:15, ye.xingchen@zte.com.cn wrote:
> > From: ye xingchen <ye.xingchen@zte.com.cn>
> >
> > 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 <ye.xingchen@zte.com.cn>
> > ---
> >  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 <viresh.kumar@linaro.org>
>
> --

Applied as 6.2 material, thanks!
  

Patch

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) {