Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f61337d9 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/microcode/intel: Simplify generic_load_microcode() 



Make it return the ucode_state directly instead of assigning to a state
variable and jumping to an out: label.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20161025095522.11964-4-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5879a267

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

+5 −9
Original line number Diff line number Diff line
@@ -962,7 +962,6 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size, 
	u8 *ucode_ptr = data, *new_mc = NULL, *mc = NULL;

	int new_rev = uci->cpu_sig.rev;

	unsigned int leftover = size;

	enum ucode_state state = UCODE_OK;

	unsigned int curr_mc_size = 0;

	unsigned int csig, cpf;
@@ -1015,14 +1014,11 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size, 


	if (leftover) {

		vfree(new_mc);

		state = UCODE_ERROR;

		goto out;

		return UCODE_ERROR;

	}



	if (!new_mc) {

		state = UCODE_NFOUND;

		goto out;

	}

	if (!new_mc)

		return UCODE_NFOUND;



	vfree(uci->mc);

	uci->mc = (struct microcode_intel *)new_mc;
@@ -1036,8 +1032,8 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size, 


	pr_debug("CPU%d found a matching microcode update with version 0x%x (current=0x%x)\n",

		 cpu, new_rev, uci->cpu_sig.rev);

out:

	return state;



	return UCODE_OK;

}



static int get_ucode_fw(void *to, const void *from, size_t n)