Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 81f0cd9

Browse files
JoePerchestorvalds
JoePerches
authored and
torvalds
committed
microblaze: mb: 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 1f33c41 ("seq_file: Rename seq_overflow() to seq_has_overflowed() and make public") Signed-off-by: Joe Perches <[email protected]> Acked-by: Michal Simek <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 7f032d6 commit 81f0cd9

File tree

1 file changed

+73
-76
lines changed
  • arch/microblaze/kernel/cpu

1 file changed

+73
-76
lines changed

‎arch/microblaze/kernel/cpu/mb.c‎

Lines changed: 73 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
static int show_cpuinfo(struct seq_file *m, void *v)
2929
{
30-
int count = 0;
3130
char *fpga_family = "Unknown";
3231
char *cpu_ver = "Unknown";
3332
int i;
@@ -48,91 +47,89 @@ static int show_cpuinfo(struct seq_file *m, void *v)
4847
}
4948
}
5049

51-
count = seq_printf(m,
52-
"CPU-Family: MicroBlaze\n"
53-
"FPGA-Arch: %s\n"
54-
"CPU-Ver: %s, %s endian\n"
55-
"CPU-MHz: %d.%02d\n"
56-
"BogoMips: %lu.%02lu\n",
57-
fpga_family,
58-
cpu_ver,
59-
cpuinfo.endian ? "little" : "big",
60-
cpuinfo.cpu_clock_freq /
61-
1000000,
62-
cpuinfo.cpu_clock_freq %
63-
1000000,
64-
loops_per_jiffy / (500000 / HZ),
65-
(loops_per_jiffy / (5000 / HZ)) % 100);
66-
67-
count += seq_printf(m,
68-
"HW:\n Shift:\t\t%s\n"
69-
" MSR:\t\t%s\n"
70-
" PCMP:\t\t%s\n"
71-
" DIV:\t\t%s\n",
72-
(cpuinfo.use_instr & PVR0_USE_BARREL_MASK) ? "yes" : "no",
73-
(cpuinfo.use_instr & PVR2_USE_MSR_INSTR) ? "yes" : "no",
74-
(cpuinfo.use_instr & PVR2_USE_PCMP_INSTR) ? "yes" : "no",
75-
(cpuinfo.use_instr & PVR0_USE_DIV_MASK) ? "yes" : "no");
76-
77-
count += seq_printf(m,
78-
" MMU:\t\t%x\n",
79-
cpuinfo.mmu);
80-
81-
count += seq_printf(m,
82-
" MUL:\t\t%s\n"
83-
" FPU:\t\t%s\n",
84-
(cpuinfo.use_mult & PVR2_USE_MUL64_MASK) ? "v2" :
85-
(cpuinfo.use_mult & PVR0_USE_HW_MUL_MASK) ? "v1" : "no",
86-
(cpuinfo.use_fpu & PVR2_USE_FPU2_MASK) ? "v2" :
87-
(cpuinfo.use_fpu & PVR0_USE_FPU_MASK) ? "v1" : "no");
88-
89-
count += seq_printf(m,
90-
" Exc:\t\t%s%s%s%s%s%s%s%s\n",
91-
(cpuinfo.use_exc & PVR2_OPCODE_0x0_ILL_MASK) ? "op0x0 " : "",
92-
(cpuinfo.use_exc & PVR2_UNALIGNED_EXC_MASK) ? "unal " : "",
93-
(cpuinfo.use_exc & PVR2_ILL_OPCODE_EXC_MASK) ? "ill " : "",
94-
(cpuinfo.use_exc & PVR2_IOPB_BUS_EXC_MASK) ? "iopb " : "",
95-
(cpuinfo.use_exc & PVR2_DOPB_BUS_EXC_MASK) ? "dopb " : "",
96-
(cpuinfo.use_exc & PVR2_DIV_ZERO_EXC_MASK) ? "zero " : "",
97-
(cpuinfo.use_exc & PVR2_FPU_EXC_MASK) ? "fpu " : "",
98-
(cpuinfo.use_exc & PVR2_USE_FSL_EXC) ? "fsl " : "");
99-
100-
count += seq_printf(m,
101-
"Stream-insns:\t%sprivileged\n",
102-
cpuinfo.mmu_privins ? "un" : "");
50+
seq_printf(m,
51+
"CPU-Family: MicroBlaze\n"
52+
"FPGA-Arch: %s\n"
53+
"CPU-Ver: %s, %s endian\n"
54+
"CPU-MHz: %d.%02d\n"
55+
"BogoMips: %lu.%02lu\n",
56+
fpga_family,
57+
cpu_ver,
58+
cpuinfo.endian ? "little" : "big",
59+
cpuinfo.cpu_clock_freq / 1000000,
60+
cpuinfo.cpu_clock_freq % 1000000,
61+
loops_per_jiffy / (500000 / HZ),
62+
(loops_per_jiffy / (5000 / HZ)) % 100);
63+
64+
seq_printf(m,
65+
"HW:\n Shift:\t\t%s\n"
66+
" MSR:\t\t%s\n"
67+
" PCMP:\t\t%s\n"
68+
" DIV:\t\t%s\n",
69+
(cpuinfo.use_instr & PVR0_USE_BARREL_MASK) ? "yes" : "no",
70+
(cpuinfo.use_instr & PVR2_USE_MSR_INSTR) ? "yes" : "no",
71+
(cpuinfo.use_instr & PVR2_USE_PCMP_INSTR) ? "yes" : "no",
72+
(cpuinfo.use_instr & PVR0_USE_DIV_MASK) ? "yes" : "no");
73+
74+
seq_printf(m, " MMU:\t\t%x\n", cpuinfo.mmu);
75+
76+
seq_printf(m,
77+
" MUL:\t\t%s\n"
78+
" FPU:\t\t%s\n",
79+
(cpuinfo.use_mult & PVR2_USE_MUL64_MASK) ? "v2" :
80+
(cpuinfo.use_mult & PVR0_USE_HW_MUL_MASK) ? "v1" : "no",
81+
(cpuinfo.use_fpu & PVR2_USE_FPU2_MASK) ? "v2" :
82+
(cpuinfo.use_fpu & PVR0_USE_FPU_MASK) ? "v1" : "no");
83+
84+
seq_printf(m,
85+
" Exc:\t\t%s%s%s%s%s%s%s%s\n",
86+
(cpuinfo.use_exc & PVR2_OPCODE_0x0_ILL_MASK) ? "op0x0 " : "",
87+
(cpuinfo.use_exc & PVR2_UNALIGNED_EXC_MASK) ? "unal " : "",
88+
(cpuinfo.use_exc & PVR2_ILL_OPCODE_EXC_MASK) ? "ill " : "",
89+
(cpuinfo.use_exc & PVR2_IOPB_BUS_EXC_MASK) ? "iopb " : "",
90+
(cpuinfo.use_exc & PVR2_DOPB_BUS_EXC_MASK) ? "dopb " : "",
91+
(cpuinfo.use_exc & PVR2_DIV_ZERO_EXC_MASK) ? "zero " : "",
92+
(cpuinfo.use_exc & PVR2_FPU_EXC_MASK) ? "fpu " : "",
93+
(cpuinfo.use_exc & PVR2_USE_FSL_EXC) ? "fsl " : "");
94+
95+
seq_printf(m,
96+
"Stream-insns:\t%sprivileged\n",
97+
cpuinfo.mmu_privins ? "un" : "");
10398

10499
if (cpuinfo.use_icache)
105-
count += seq_printf(m,
106-
"Icache:\t\t%ukB\tline length:\t%dB\n",
107-
cpuinfo.icache_size >> 10,
108-
cpuinfo.icache_line_length);
100+
seq_printf(m,
101+
"Icache:\t\t%ukB\tline length:\t%dB\n",
102+
cpuinfo.icache_size >> 10,
103+
cpuinfo.icache_line_length);
109104
else
110-
count += seq_printf(m, "Icache:\t\tno\n");
105+
seq_puts(m, "Icache:\t\tno\n");
111106

112107
if (cpuinfo.use_dcache) {
113-
count += seq_printf(m,
114-
"Dcache:\t\t%ukB\tline length:\t%dB\n",
115-
cpuinfo.dcache_size >> 10,
116-
cpuinfo.dcache_line_length);
117-
seq_printf(m, "Dcache-Policy:\t");
108+
seq_printf(m,
109+
"Dcache:\t\t%ukB\tline length:\t%dB\n",
110+
cpuinfo.dcache_size >> 10,
111+
cpuinfo.dcache_line_length);
112+
seq_puts(m, "Dcache-Policy:\t");
118113
if (cpuinfo.dcache_wb)
119-
count += seq_printf(m, "write-back\n");
114+
seq_puts(m, "write-back\n");
120115
else
121-
count += seq_printf(m, "write-through\n");
122-
} else
123-
count += seq_printf(m, "Dcache:\t\tno\n");
116+
seq_puts(m, "write-through\n");
117+
} else {
118+
seq_puts(m, "Dcache:\t\tno\n");
119+
}
120+
121+
seq_printf(m,
122+
"HW-Debug:\t%s\n",
123+
cpuinfo.hw_debug ? "yes" : "no");
124124

125-
count += seq_printf(m,
126-
"HW-Debug:\t%s\n",
127-
cpuinfo.hw_debug ? "yes" : "no");
125+
seq_printf(m,
126+
"PVR-USR1:\t%02x\n"
127+
"PVR-USR2:\t%08x\n",
128+
cpuinfo.pvr_user1,
129+
cpuinfo.pvr_user2);
128130

129-
count += seq_printf(m,
130-
"PVR-USR1:\t%02x\n"
131-
"PVR-USR2:\t%08x\n",
132-
cpuinfo.pvr_user1,
133-
cpuinfo.pvr_user2);
131+
seq_printf(m, "Page size:\t%lu\n", PAGE_SIZE);
134132

135-
count += seq_printf(m, "Page size:\t%lu\n", PAGE_SIZE);
136133
return 0;
137134
}
138135

0 commit comments

Comments
 (0)