From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759330AbcJYQ3q (ORCPT ); Tue, 25 Oct 2016 12:29:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39774 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759208AbcJYQ3m (ORCPT ); Tue, 25 Oct 2016 12:29:42 -0400 Date: Tue, 25 Oct 2016 09:28:47 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: luto@kernel.org, hpa@zytor.com, mingo@kernel.org, bp@alien8.de, jpoimboe@redhat.com, peterz@infradead.org, brgerst@gmail.com, linux-kernel@vger.kernel.org, bp@suse.de, tglx@linutronix.de, dvlasenk@redhat.com, torvalds@linux-foundation.org Reply-To: bp@alien8.de, jpoimboe@redhat.com, peterz@infradead.org, luto@kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, dvlasenk@redhat.com, torvalds@linux-foundation.org, brgerst@gmail.com, linux-kernel@vger.kernel.org, bp@suse.de In-Reply-To: <20161025095522.11964-4-bp@alien8.de> References: <20161025095522.11964-4-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode/intel: Simplify generic_load_microcode() Git-Commit-ID: f61337d9841210329c177a20061f49fafff3ff76 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f61337d9841210329c177a20061f49fafff3ff76 Gitweb: http://git.kernel.org/tip/f61337d9841210329c177a20061f49fafff3ff76 Author: Borislav Petkov AuthorDate: Tue, 25 Oct 2016 11:55:13 +0200 Committer: Ingo Molnar CommitDate: Tue, 25 Oct 2016 12:28:57 +0200 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: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20161025095522.11964-4-bp@alien8.de Signed-off-by: Ingo Molnar --- 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 cdc0dea..b84288e 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)