[PATCH v4 13/47] x86/tsc: Fold native_calibrate_cpu() into recalibrate_cpu_khz()

[Sean Christopherson <seanjc@xxxxxxxxxx>]

Fold the guts of native_calibrate_cpu() into its sole remaining caller,
recalibrate_cpu_khz() to eliminate the extra SMP=n #ifdef, and so that it's
more obvious that directly invoking the early vs. late calibration routines
in determine_cpu_tsc_frequencies() is intentional.

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
 arch/x86/kernel/tsc.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 534462c81c78..3e911f0f7364 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -945,21 +945,6 @@ static unsigned long native_calibrate_cpu_early(void)
        return fast_calibrate;
 }
 
-#ifndef CONFIG_SMP
-/**
- * native_calibrate_cpu - calibrate the cpu
- */
-static unsigned long native_calibrate_cpu(void)
-{
-       unsigned long tsc_freq = native_calibrate_cpu_early();
-
-       if (!tsc_freq)
-               tsc_freq = native_calibrate_cpu_late();
-
-       return tsc_freq;
-}
-#endif
-
 void recalibrate_cpu_khz(void)
 {
 #ifndef CONFIG_SMP
@@ -968,7 +953,10 @@ void recalibrate_cpu_khz(void)
        if (!boot_cpu_has(X86_FEATURE_TSC))
                return;
 
-       cpu_khz = native_calibrate_cpu();
+       cpu_khz = native_calibrate_cpu_early();
+       if (!cpu_khz)
+               cpu_khz = native_calibrate_cpu_late();
+
        if (!boot_cpu_has(X86_FEATURE_TSC_KNOWN_FREQ))
                tsc_khz = native_calibrate_tsc();
        if (tsc_khz == 0)
-- 
2.54.0.823.g6e5bcc1fc9-goog