lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cris: remove use of seq_printf return value

Browse Source 
The seq_printf return value, because it's frequently misused,
will eventually be converted to void.

See: commit 1f33c41c03 ("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>
This commit is contained in:
Joe Perches
2015-04-15 16:18:08 -07:00
committed by Linus Torvalds
parent 58a1aa7c83
commit 1336d4221d
2 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
arch/cris/arch-v10/kernel/setup.c
View File

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

60
arch/cris/arch-v32/kernel/setup.c
View File

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