diff mbox series

[tip:,x86/microcode] x86/microcode/AMD: Get rid of __find_equiv_id()

Message ID 168355013878.404.6720675388219891668.tip-bot2@tip-bot2
State New
Headers
Series [tip:,x86/microcode] x86/microcode/AMD: Get rid of __find_equiv_id() |

Commit Message

tip-bot2 for Thomas Gleixner May 8, 2023, 12:48 p.m. UTC 
  The following commit has been merged into the x86/microcode branch of tip:

Commit-ID:     37a19366e10b95380bf33e7a8b02509980399d7e
Gitweb:        https://git.kernel.org/tip/37a19366e10b95380bf33e7a8b02509980399d7e
Author:        Borislav Petkov (AMD) <bp@alien8.de>
AuthorDate:    Mon, 27 Feb 2023 17:03:52 +01:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Mon, 08 May 2023 14:24:11 +02:00

x86/microcode/AMD: Get rid of __find_equiv_id()

Merge it into its only call site.

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230227160352.7260-1-bp@alien8.de
---
 arch/x86/kernel/cpu/microcode/amd.c |  9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
index f5fdeb1..dd33ee8 100644
--- a/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -596,11 +596,6 @@  void reload_ucode_amd(unsigned int cpu)
 		}
 	}
 }
-static u16 __find_equiv_id(unsigned int cpu)
-{
-	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
-	return find_equiv_id(&equiv_table, uci->cpu_sig.sig);
-}
 
 /*
  * a small, trivial cache of per-family ucode patches
@@ -651,9 +646,11 @@  static void free_cache(void)
 
 static struct ucode_patch *find_patch(unsigned int cpu)
 {
+	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 	u16 equiv_id;
 
-	equiv_id = __find_equiv_id(cpu);
+
+	equiv_id = find_equiv_id(&equiv_table, uci->cpu_sig.sig);
 	if (!equiv_id)
 		return NULL;