Re: [PATCH] MIPS: kernel: proc: Remove spurious white space in cpuinfo

[Joe Perches <joe@xxxxxxxxxxx>]

On Fri, 2017-10-20 at 16:20 +0200, Aleksandar Markovic wrote:
> From: Dragan Cecavac <dragan.cecavac@xxxxxxxx>
> 
> Remove unnecessary space from FPU info segment of /proc/cpuinfo.
> 
> Signed-off-by: Dragan Cecavac <dragan.cecavac@xxxxxxxx>
> Signed-off-by: Aleksandar Markovic <aleksandar.markovic@xxxxxxxx>
> ---
>  arch/mips/kernel/proc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
> index bd9bf52..99f9aab 100644
> --- a/arch/mips/kernel/proc.c
> +++ b/arch/mips/kernel/proc.c
> @@ -58,7 +58,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
>  
>  	seq_printf(m, "processor\t\t: %ld\n", n);
>  	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
> -		      cpu_data[n].options & MIPS_CPU_FPU ? "  FPU V%d.%d" : "");
> +		      cpu_data[n].options & MIPS_CPU_FPU ? " FPU V%d.%d" : "");
>  	seq_printf(m, fmt, __cpu_name[n],
>  		      (version >> 4) & 0x0f, version & 0x0f,
>  		      (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);

That's somewhat unpleasant code as it formats a fmt string
and the compiler can not verify fmt and args.

Perhaps something like the below is preferable:
---
 arch/mips/kernel/proc.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index bd9bf528f19b..dda4af8fcd7b 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -38,7 +38,6 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 	unsigned long n = (unsigned long) v - 1;
 	unsigned int version = cpu_data[n].processor_id;
 	unsigned int fp_vers = cpu_data[n].fpu_id;
-	char fmt [64];
 	int i;
 
 #ifdef CONFIG_SMP
@@ -57,11 +56,13 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 	}
 
 	seq_printf(m, "processor\t\t: %ld\n", n);
-	sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
-		      cpu_data[n].options & MIPS_CPU_FPU ? "  FPU V%d.%d" : "");
-	seq_printf(m, fmt, __cpu_name[n],
-		      (version >> 4) & 0x0f, version & 0x0f,
+	seq_printf(m, "cpu model\t\t: %s V%d.%d",
+		   __cpu_name[n], (version >> 4) & 0x0f, version & 0x0f);
+	if (cpu_data[n].options & MIPS_CPU_FPU)
+		seq_printf(m, " FPU V%d.%d\n",
 		      (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);
+	else
+		seq_printf(m, "\n");
 	seq_printf(m, "BogoMIPS\t\t: %u.%02u\n",
 		      cpu_data[n].udelay_val / (500000/HZ),
 		      (cpu_data[n].udelay_val / (5000/HZ)) % 100);
@@ -143,10 +144,13 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 		seq_printf(m, "VP\t\t\t: %d\n", cpu_vpe_id(&cpu_data[n]));
 #endif
 
-	sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
-		      cpu_has_vce ? "%u" : "not available");
-	seq_printf(m, fmt, 'D', vced_count);
-	seq_printf(m, fmt, 'I', vcei_count);
+	if (cpu_has_vce) {
+		seq_printf(m, "VCE%c exceptions\t\t: %u\n", 'D', vced_count);
+		seq_printf(m, "VCE%c exceptions\t\t: %u\n", 'I', vcei_count);
+	} else {
+		seq_printf(m, "VCE%c exceptions\t\t: not available\n", 'D');
+		seq_printf(m, "VCE%c exceptions\t\t: not available\n", 'I');
+	}
 
 	proc_cpuinfo_notifier_args.m = m;
 	proc_cpuinfo_notifier_args.n = n;