cris: remove use of seq_printf return value

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>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/cris/arch-v10/kernel/setup.c b/arch/cris/arch-v10/kernel/setup.c
index 4f96d71b51547f4ec656d0d587af0d88d0dd75f8..7ab31f1c754090fe489f8fe400c2ad78ce6d3443 100644 (file)
--- a/arch/cris/arch-v10/kernel/setup.c
+++ b/arch/cris/arch-v10/kernel/setup.c
@@ -63,35 +63,37 @@ int show_cpuinfo(struct seq_file *m, void *v)
        else
                info = &cpu_info[revision];
 
-       return seq_printf(m,
-                      "processor\t: 0\n" 
-                      "cpu\t\t: CRIS\n"
-                      "cpu revision\t: %lu\n"
-                      "cpu model\t: %s\n"
-                      "cache size\t: %d kB\n"
-                      "fpu\t\t: %s\n"
-                      "mmu\t\t: %s\n"
-                      "mmu DMA bug\t: %s\n"
-                      "ethernet\t: %s Mbps\n"
-                      "token ring\t: %s\n"
-                      "scsi\t\t: %s\n"
-                      "ata\t\t: %s\n"
-                      "usb\t\t: %s\n"
-                      "bogomips\t: %lu.%02lu\n",
+       seq_printf(m,
+                  "processor\t: 0\n"
+                  "cpu\t\t: CRIS\n"
+                  "cpu revision\t: %lu\n"
+                  "cpu model\t: %s\n"
+                  "cache size\t: %d kB\n"
+                  "fpu\t\t: %s\n"
+                  "mmu\t\t: %s\n"
+                  "mmu DMA bug\t: %s\n"
+                  "ethernet\t: %s Mbps\n"
+                  "token ring\t: %s\n"
+                  "scsi\t\t: %s\n"
+                  "ata\t\t: %s\n"
+                  "usb\t\t: %s\n"
+                  "bogomips\t: %lu.%02lu\n",
 
-                      revision,
-                      info->model,
-                      info->cache,
-                      info->flags & HAS_FPU ? "yes" : "no",
-                      info->flags & HAS_MMU ? "yes" : "no",
-                      info->flags & HAS_MMU_BUG ? "yes" : "no",
-                      info->flags & HAS_ETHERNET100 ? "10/100" : "10",
-                      info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
-                      info->flags & HAS_SCSI ? "yes" : "no",
-                      info->flags & HAS_ATA ? "yes" : "no",
-                      info->flags & HAS_USB ? "yes" : "no",
-                      (loops_per_jiffy * HZ + 500) / 500000,
-                      ((loops_per_jiffy * HZ + 500) / 5000) % 100);
+                  revision,
+                  info->model,
+                  info->cache,
+                  info->flags & HAS_FPU ? "yes" : "no",
+                  info->flags & HAS_MMU ? "yes" : "no",
+                  info->flags & HAS_MMU_BUG ? "yes" : "no",
+                  info->flags & HAS_ETHERNET100 ? "10/100" : "10",
+                  info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
+                  info->flags & HAS_SCSI ? "yes" : "no",
+                  info->flags & HAS_ATA ? "yes" : "no",
+                  info->flags & HAS_USB ? "yes" : "no",
+                  (loops_per_jiffy * HZ + 500) / 500000,
+                  ((loops_per_jiffy * HZ + 500) / 5000) % 100);
+
+       return 0;
 }
 
 #endif /* CONFIG_PROC_FS */

diff --git a/arch/cris/arch-v32/kernel/setup.c b/arch/cris/arch-v32/kernel/setup.c
index 61e10ae65296e8f254329a5b1d289ee976c76a93..81715c683baf08a3339c15305a457cd760d5523b 100644 (file)
--- a/arch/cris/arch-v32/kernel/setup.c
+++ b/arch/cris/arch-v32/kernel/setup.c
@@ -77,36 +77,38 @@ int show_cpuinfo(struct seq_file *m, void *v)
                }
        }
 
-       return seq_printf(m,
-               "processor\t: %d\n"
-               "cpu\t\t: CRIS\n"
-               "cpu revision\t: %lu\n"
-               "cpu model\t: %s\n"
-               "cache size\t: %d KB\n"
-               "fpu\t\t: %s\n"
-               "mmu\t\t: %s\n"
-               "mmu DMA bug\t: %s\n"
-               "ethernet\t: %s Mbps\n"
-               "token ring\t: %s\n"
-               "scsi\t\t: %s\n"
-               "ata\t\t: %s\n"
-               "usb\t\t: %s\n"
-               "bogomips\t: %lu.%02lu\n\n",
-
-               cpu,
-               revision,
-               info->cpu_model,
-               info->cache_size,
-               info->flags & HAS_FPU ? "yes" : "no",
-               info->flags & HAS_MMU ? "yes" : "no",
-               info->flags & HAS_MMU_BUG ? "yes" : "no",
-               info->flags & HAS_ETHERNET100 ? "10/100" : "10",
-               info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
-               info->flags & HAS_SCSI ? "yes" : "no",
-               info->flags & HAS_ATA ? "yes" : "no",
-               info->flags & HAS_USB ? "yes" : "no",
-               (loops_per_jiffy * HZ + 500) / 500000,
-               ((loops_per_jiffy * HZ + 500) / 5000) % 100);
+       seq_printf(m,
+                  "processor\t: %d\n"
+                  "cpu\t\t: CRIS\n"
+                  "cpu revision\t: %lu\n"
+                  "cpu model\t: %s\n"
+                  "cache size\t: %d KB\n"
+                  "fpu\t\t: %s\n"
+                  "mmu\t\t: %s\n"
+                  "mmu DMA bug\t: %s\n"
+                  "ethernet\t: %s Mbps\n"
+                  "token ring\t: %s\n"
+                  "scsi\t\t: %s\n"
+                  "ata\t\t: %s\n"
+                  "usb\t\t: %s\n"
+                  "bogomips\t: %lu.%02lu\n\n",
+
+                  cpu,
+                  revision,
+                  info->cpu_model,
+                  info->cache_size,
+                  info->flags & HAS_FPU ? "yes" : "no",
+                  info->flags & HAS_MMU ? "yes" : "no",
+                  info->flags & HAS_MMU_BUG ? "yes" : "no",
+                  info->flags & HAS_ETHERNET100 ? "10/100" : "10",
+                  info->flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
+                  info->flags & HAS_SCSI ? "yes" : "no",
+                  info->flags & HAS_ATA ? "yes" : "no",
+                  info->flags & HAS_USB ? "yes" : "no",
+                  (loops_per_jiffy * HZ + 500) / 500000,
+                  ((loops_per_jiffy * HZ + 500) / 5000) % 100);
+
+       return 0;
 }
 
 #endif /* CONFIG_PROC_FS */