tools/x86/kcpuid: Use C99-style for loops

Since commit e8c07082a810 ("Kbuild: move to -std=gnu11") and the kernel
allows C99-style variable declarations inside of a for() loop.

Adjust the kcpuid code accordingly.

Note, this helps readability as some of the kcpuid functions have a huge
list of variable declarations on top.

Note, remove the empty lines before cpuid() invocations as it is clearer
to have their parameter initialization and the actual call in one block.

Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20250324142042.29010-10-darwi@linutronix.de

diff --git a/tools/arch/x86/kcpuid/kcpuid.c b/tools/arch/x86/kcpuid/kcpuid.c
index 4fa768bb49e15303a2e13657241326b5d850502e..413e5dad9e467e6ce8e148d562d3e0a721b84615 100644 (file)
--- a/tools/arch/x86/kcpuid/kcpuid.c
+++ b/tools/arch/x86/kcpuid/kcpuid.c
@@ -172,13 +172,10 @@ static bool cpuid_store(struct cpuid_range *range, u32 f, int subleaf,
 
 static void raw_dump_range(struct cpuid_range *range)
 {
-       u32 f;
-       int i;
-
        printf("%s Leafs :\n", range->is_ext ? "Extended" : "Basic");
        printf("================\n");
 
-       for (f = 0; (int)f < range->nr; f++) {
+       for (u32 f = 0; (int)f < range->nr; f++) {
                struct cpuid_func *func = &range->funcs[f];
 
                /* Skip leaf without valid items */
@@ -186,7 +183,7 @@ static void raw_dump_range(struct cpuid_range *range)
                        continue;
 
                /* First item is the main leaf, followed by all subleafs */
-               for (i = 0; i < func->nr; i++)
+               for (int i = 0; i < func->nr; i++)
                        leaf_print_raw(&func->leafs[i]);
        }
 }
@@ -194,15 +191,14 @@ static void raw_dump_range(struct cpuid_range *range)
 #define MAX_SUBLEAF_NUM                64
 struct cpuid_range *setup_cpuid_range(u32 input_eax)
 {
-       u32 max_func, idx_func, subleaf, max_subleaf;
-       u32 eax, ebx, ecx, edx, f = input_eax;
        struct cpuid_range *range;
-       bool allzero;
+       u32 max_func, idx_func;
+       u32 eax, ebx, ecx, edx;
 
        eax = input_eax;
        ebx = ecx = edx = 0;
-
        cpuid(&eax, &ebx, &ecx, &edx);
+
        max_func = eax;
        idx_func = (max_func & 0xffff) + 1;
 
@@ -222,20 +218,21 @@ struct cpuid_range *setup_cpuid_range(u32 input_eax)
        range->nr = idx_func;
        memset(range->funcs, 0, sizeof(struct cpuid_func) * idx_func);
 
-       for (; f <= max_func; f++) {
-               eax = f;
-               subleaf = ecx = 0;
+       for (u32 f = input_eax; f <= max_func; f++) {
+               u32 max_subleaf = MAX_SUBLEAF_NUM;
+               bool allzero;
 
+               eax = f;
+               ecx = 0;
                cpuid(&eax, &ebx, &ecx, &edx);
-               allzero = cpuid_store(range, f, subleaf, eax, ebx, ecx, edx);
+
+               allzero = cpuid_store(range, f, 0, eax, ebx, ecx, edx);
                if (allzero)
                        continue;
 
                if (!has_subleafs(f))
                        continue;
 
-               max_subleaf = MAX_SUBLEAF_NUM;
-
                /*
                 * Some can provide the exact number of subleafs,
                 * others have to be tried (0xf)
@@ -253,13 +250,12 @@ struct cpuid_range *setup_cpuid_range(u32 input_eax)
                if (f == 0x80000026)
                        max_subleaf = 5;
 
-               for (subleaf = 1; subleaf < max_subleaf; subleaf++) {
+               for (u32 subleaf = 1; subleaf < max_subleaf; subleaf++) {
                        eax = f;
                        ecx = subleaf;
-
                        cpuid(&eax, &ebx, &ecx, &edx);
-                       allzero = cpuid_store(range, f, subleaf,
-                                               eax, ebx, ecx, edx);
+
+                       allzero = cpuid_store(range, f, subleaf, eax, ebx, ecx, edx);
                        if (allzero)
                                continue;
                }
@@ -280,12 +276,10 @@ struct cpuid_range *setup_cpuid_range(u32 input_eax)
 static void parse_line(char *line)
 {
        char *str;
-       int i;
        struct cpuid_range *range;
        struct cpuid_func *func;
        struct subleaf *leaf;
        u32 index;
-       u32 sub;
        char buffer[512];
        char *buf;
        /*
@@ -312,7 +306,7 @@ static void parse_line(char *line)
        strncpy(buffer, line, 511);
        buffer[511] = 0;
        str = buffer;
-       for (i = 0; i < 5; i++) {
+       for (int i = 0; i < 5; i++) {
                tokens[i] = strtok(str, ",");
                if (!tokens[i])
                        goto err_exit;
@@ -378,7 +372,7 @@ static void parse_line(char *line)
        bit_end = strtoul(end, NULL, 0);
        bit_start = (start) ? strtoul(start, NULL, 0) : bit_end;
 
-       for (sub = subleaf_start; sub <= subleaf_end; sub++) {
+       for (u32 sub = subleaf_start; sub <= subleaf_end; sub++) {
                leaf = &func->leafs[sub];
                reg = &leaf->info[reg_index];
                bdesc = &reg->descs[reg->nr++];
@@ -432,10 +426,10 @@ static void parse_text(void)
 static void show_reg(const struct reg_desc *rdesc, u32 value)
 {
        const struct bits_desc *bdesc;
-       int start, end, i;
+       int start, end;
        u32 mask;
 
-       for (i = 0; i < rdesc->nr; i++) {
+       for (int i = 0; i < rdesc->nr; i++) {
                bdesc = &rdesc->descs[i];
 
                start = bdesc->start;
@@ -487,17 +481,13 @@ static void show_leaf(struct subleaf *leaf)
 
 static void show_func(struct cpuid_func *func)
 {
-       int i;
-
-       for (i = 0; i < func->nr; i++)
+       for (int i = 0; i < func->nr; i++)
                show_leaf(&func->leafs[i]);
 }
 
 static void show_range(struct cpuid_range *range)
 {
-       int i;
-
-       for (i = 0; i < range->nr; i++)
+       for (int i = 0; i < range->nr; i++)
                show_func(&range->funcs[i]);
 }