[PATCH 04/16] x86/cpu: Fold generic_identify() into its single caller

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

This makes the correctness of future changes more obvious.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
CC: Julian Vetter <julian.vetter@xxxxxxxxxx>
CC: Teddy Astie <teddy.astie@xxxxxxxxxx>
---
 xen/arch/x86/cpu/common.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index dda0d5d39c92..89b58e6182b9 100644
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -455,10 +455,13 @@ void reset_cpuinfo(struct cpuinfo_x86 *c, bool keep_basic)
     CPU_DATA_INIT((*c));
 }
 
-static void generic_identify(struct cpuinfo_x86 *c)
+void identify_cpu(struct cpuinfo_x86 *c)
 {
        uint64_t val;
        u32 eax, ebx, ecx, edx, tmp;
+       int i;
+
+       reset_cpuinfo(c, false);
 
        /* Get vendor name */
        cpuid(0, &c->cpuid_level, &ebx, &ecx, &edx);
@@ -550,17 +553,6 @@ static void generic_identify(struct cpuinfo_x86 *c)
                c->x86_capability[FEATURESET_m10Al] = val;
                c->x86_capability[FEATURESET_m10Ah] = val >> 32;
        }
-}
-
-/*
- * This does the hard work of actually picking apart the CPU stuff...
- */
-void identify_cpu(struct cpuinfo_x86 *c)
-{
-       int i;
-
-       reset_cpuinfo(c, false);
-       generic_identify(c);
 
 #ifdef NOISY_CAPS
        printk(KERN_DEBUG "CPU: After vendor identify, caps:");
-- 
2.39.5