Skip to content

Commit 854857f

Browse files
suryasaimadhuKAGA-KOKO
authored andcommitted
x86/microcode: Get rid of struct apply_microcode_ctx
It is a useless remnant from earlier times. Use the ucode_state enum directly. No functional change. Signed-off-by: Borislav Petkov <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Tested-by: Tom Lendacky <[email protected]> Tested-by: Ashok Raj <[email protected]> Cc: Arjan Van De Ven <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 3626822 commit 854857f

File tree

1 file changed

+8
-11
lines changed
  • arch/x86/kernel/cpu/microcode

1 file changed

+8
-11
lines changed

arch/x86/kernel/cpu/microcode/core.c

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -373,26 +373,23 @@ static int collect_cpu_info(int cpu)
373373
return ret;
374374
}
375375

376-
struct apply_microcode_ctx {
377-
enum ucode_state err;
378-
};
379-
380376
static void apply_microcode_local(void *arg)
381377
{
382-
struct apply_microcode_ctx *ctx = arg;
378+
enum ucode_state *err = arg;
383379

384-
ctx->err = microcode_ops->apply_microcode(smp_processor_id());
380+
*err = microcode_ops->apply_microcode(smp_processor_id());
385381
}
386382

387383
static int apply_microcode_on_target(int cpu)
388384
{
389-
struct apply_microcode_ctx ctx = { .err = 0 };
385+
enum ucode_state err;
390386
int ret;
391387

392-
ret = smp_call_function_single(cpu, apply_microcode_local, &ctx, 1);
393-
if (!ret)
394-
ret = ctx.err;
395-
388+
ret = smp_call_function_single(cpu, apply_microcode_local, &err, 1);
389+
if (!ret) {
390+
if (err == UCODE_ERROR)
391+
ret = 1;
392+
}
396393
return ret;
397394
}
398395

0 commit comments

Comments
 (0)