From: Borislav Petkov <bp@alien8.de>
To: X86 ML <x86@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 03/12] x86/microcode/intel: Simplify generic_load_microcode()
Date: Tue, 25 Oct 2016 11:55:13 +0200 [thread overview]
Message-ID: <20161025095522.11964-4-bp@alien8.de> (raw)
In-Reply-To: <20161025095522.11964-1-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
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: Borislav Petkov <bp@suse.de>
---
arch/x86/kernel/cpu/microcode/intel.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index cdc0deab00c9..b84288e08098 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -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)
--
2.10.0
next prev parent reply other threads:[~2016-10-25 9:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 9:55 [PATCH 00/12] x86/microcode: Rework microcode loading Borislav Petkov
2016-10-25 9:55 ` [PATCH 01/12] x86/microcode: Run the AP-loading routine only on the application processors Borislav Petkov
2016-10-25 16:27 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 02/12] x86/microcode: Move driver authors to CREDITS Borislav Petkov
2016-10-25 16:28 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` Borislav Petkov [this message]
2016-10-25 16:28 ` [tip:x86/microcode] x86/microcode/intel: Simplify generic_load_microcode() tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 04/12] x86/microcode: Remove one ifdef clause Borislav Petkov
2016-10-25 16:29 ` [tip:x86/microcode] x86/microcode: Remove one #ifdef clause tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 05/12] x86/microcode: Export the microcode cache linked list Borislav Petkov
2016-10-25 16:29 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 06/12] x86/microcode/AMD: Hand down the CPU family Borislav Petkov
2016-10-25 16:30 ` [tip:x86/microcode] x86/microcode/amd: " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 07/12] x86/microcode: Issue the debug printk on resume only on success Borislav Petkov
2016-10-25 16:30 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 08/12] x86/microcode: Collect CPU info on resume Borislav Petkov
2016-10-25 16:31 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 09/12] x86/microcode/AMD: Retract functions Borislav Petkov
2016-10-25 16:31 ` [tip:x86/microcode] x86/microcode/amd: Move private inlines to .c and mark local functions static tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 10/12] x86/microcode/intel: Remove intel_lib.c Borislav Petkov
2016-10-25 16:32 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 11/12] x86/microcode: Rework microcode loading Borislav Petkov
2016-10-25 16:32 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
2016-10-25 9:55 ` [PATCH 12/12] x86/microcode: Bump driver version, update copyrights Borislav Petkov
2016-10-25 16:33 ` [tip:x86/microcode] " tip-bot for Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161025095522.11964-4-bp@alien8.de \
--to=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).