[tip: x86/cleanups] x86/CPU/AMD: Remove amd_get_topology_early()

[tip-bot2 for Borislav Petkov]

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     3c749b81ee99ef1a01d342ee5e4bc01e4332eb75
Gitweb:        https://git.kernel.org/tip/3c749b81ee99ef1a01d342ee5e4bc01e4332eb75
Author:        Borislav Petkov <bp@xxxxxxx>
AuthorDate:    Thu, 23 Jan 2020 17:54:33 +01:00
Committer:     Borislav Petkov <bp@xxxxxxx>
CommitterDate: Sat, 25 Jan 2020 12:59:46 +01:00

x86/CPU/AMD: Remove amd_get_topology_early()

... and fold its function body into its single call site.

No functional changes:

  # arch/x86/kernel/cpu/amd.o:

   text    data     bss     dec     hex filename
   5994     385       1    6380    18ec amd.o.before
   5994     385       1    6380    18ec amd.o.after

md5:
   99ec6daa095b502297884e949c520f90  amd.o.before.asm
   99ec6daa095b502297884e949c520f90  amd.o.after.asm

Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20200123165811.5288-1-bp@xxxxxxxxx
---
 arch/x86/kernel/cpu/amd.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 90f75e5..8a88d3f 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -319,13 +319,6 @@ static void legacy_fixup_core_id(struct cpuinfo_x86 *c)
 	c->cpu_core_id %= cus_per_node;
 }
 
-
-static void amd_get_topology_early(struct cpuinfo_x86 *c)
-{
-	if (cpu_has(c, X86_FEATURE_TOPOEXT))
-		smp_num_siblings = ((cpuid_ebx(0x8000001e) >> 8) & 0xff) + 1;
-}
-
 /*
  * Fixup core topology information for
  * (1) AMD multi-node processors
@@ -717,7 +710,8 @@ static void early_init_amd(struct cpuinfo_x86 *c)
 		}
 	}
 
-	amd_get_topology_early(c);
+	if (cpu_has(c, X86_FEATURE_TOPOEXT))
+		smp_num_siblings = ((cpuid_ebx(0x8000001e) >> 8) & 0xff) + 1;
 }
 
 static void init_amd_k8(struct cpuinfo_x86 *c)