]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
nios2: cpuinfo: remove use of seq_printf return value
authorJoe Perches <joe@perches.com>
Tue, 7 Apr 2015 23:44:59 +0000 (09:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 7 Apr 2015 23:44:59 +0000 (09:44 +1000)
The seq_printf return value, because it's frequently misused,
will eventually be converted to void.

See: commit 1f33c41c03da ("seq_file: Rename seq_overflow() to
     seq_has_overflowed() and make public")

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Ley Foon Tan <lftan@altera.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
arch/nios2/kernel/cpuinfo.c

index a223691dff4fb1699c52b3e025ebb6446394fbb0..1d96de0bd4aac2e763770f010aa399d9f1617614 100644 (file)
@@ -126,47 +126,46 @@ void __init setup_cpuinfo(void)
  */
 static int show_cpuinfo(struct seq_file *m, void *v)
 {
-       int count = 0;
        const u32 clockfreq = cpuinfo.cpu_clock_freq;
 
-       count = seq_printf(m,
-                       "CPU:\t\tNios II/%s\n"
-                       "MMU:\t\t%s\n"
-                       "FPU:\t\tnone\n"
-                       "Clocking:\t%u.%02u MHz\n"
-                       "BogoMips:\t%lu.%02lu\n"
-                       "Calibration:\t%lu loops\n",
-                       cpuinfo.cpu_impl,
-                       cpuinfo.mmu ? "present" : "none",
-                       clockfreq / 1000000, (clockfreq / 100000) % 10,
-                       (loops_per_jiffy * HZ) / 500000,
-                       ((loops_per_jiffy * HZ) / 5000) % 100,
-                       (loops_per_jiffy * HZ));
-
-       count += seq_printf(m,
-                       "HW:\n"
-                       " MUL:\t\t%s\n"
-                       " MULX:\t\t%s\n"
-                       " DIV:\t\t%s\n",
-                       cpuinfo.has_mul ? "yes" : "no",
-                       cpuinfo.has_mulx ? "yes" : "no",
-                       cpuinfo.has_div ? "yes" : "no");
-
-       count += seq_printf(m,
-                       "Icache:\t\t%ukB, line length: %u\n",
-                       cpuinfo.icache_size >> 10,
-                       cpuinfo.icache_line_size);
-
-       count += seq_printf(m,
-                       "Dcache:\t\t%ukB, line length: %u\n",
-                       cpuinfo.dcache_size >> 10,
-                       cpuinfo.dcache_line_size);
-
-       count += seq_printf(m,
-                       "TLB:\t\t%u ways, %u entries, %u PID bits\n",
-                       cpuinfo.tlb_num_ways,
-                       cpuinfo.tlb_num_entries,
-                       cpuinfo.tlb_pid_num_bits);
+       seq_printf(m,
+                  "CPU:\t\tNios II/%s\n"
+                  "MMU:\t\t%s\n"
+                  "FPU:\t\tnone\n"
+                  "Clocking:\t%u.%02u MHz\n"
+                  "BogoMips:\t%lu.%02lu\n"
+                  "Calibration:\t%lu loops\n",
+                  cpuinfo.cpu_impl,
+                  cpuinfo.mmu ? "present" : "none",
+                  clockfreq / 1000000, (clockfreq / 100000) % 10,
+                  (loops_per_jiffy * HZ) / 500000,
+                  ((loops_per_jiffy * HZ) / 5000) % 100,
+                  (loops_per_jiffy * HZ));
+
+       seq_printf(m,
+                  "HW:\n"
+                  " MUL:\t\t%s\n"
+                  " MULX:\t\t%s\n"
+                  " DIV:\t\t%s\n",
+                  cpuinfo.has_mul ? "yes" : "no",
+                  cpuinfo.has_mulx ? "yes" : "no",
+                  cpuinfo.has_div ? "yes" : "no");
+
+       seq_printf(m,
+                  "Icache:\t\t%ukB, line length: %u\n",
+                  cpuinfo.icache_size >> 10,
+                  cpuinfo.icache_line_size);
+
+       seq_printf(m,
+                  "Dcache:\t\t%ukB, line length: %u\n",
+                  cpuinfo.dcache_size >> 10,
+                  cpuinfo.dcache_line_size);
+
+       seq_printf(m,
+                  "TLB:\t\t%u ways, %u entries, %u PID bits\n",
+                  cpuinfo.tlb_num_ways,
+                  cpuinfo.tlb_num_entries,
+                  cpuinfo.tlb_pid_num_bits);
 
        return 0;
 }