The following commit has been merged into the x86/microcode branch of tip: Commit-ID: ead0db14c7266c34b1f8a6db6e15e2f4100a9e9e Gitweb: https://git.kernel.org/tip/ead0db14c7266c34b1f8a6db6e15e2f4100a9e9e Author: Borislav Petkov (AMD) <bp@xxxxxxxxx> AuthorDate: Tue, 31 Dec 2024 13:58:56 +01:00 Committer: Borislav Petkov (AMD) <bp@xxxxxxxxx> CommitterDate: Tue, 31 Dec 2024 14:03:41 +01:00 x86/microcode/AMD: Remove ret local var in early_apply_microcode() No functional changes. Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx> --- arch/x86/kernel/cpu/microcode/amd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index ac3fd07..a5dac7f 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -528,13 +528,12 @@ static bool early_apply_microcode(u32 old_rev, void *ucode, size_t size) { struct cont_desc desc = { 0 }; struct microcode_amd *mc; - bool ret = false; scan_containers(ucode, size, &desc); mc = desc.mc; if (!mc) - return ret; + return false; /* * Allow application of the same revision to pick up SMT-specific @@ -542,7 +541,7 @@ static bool early_apply_microcode(u32 old_rev, void *ucode, size_t size) * up-to-date. */ if (old_rev > mc->hdr.patch_id) - return ret; + return false; return __apply_microcode_amd(mc, desc.psize); }