Messages in this thread Patch in this message | | | Date | Wed, 22 Aug 2012 16:37:41 -0700 | From | tip-bot for Borislav Petkov <> | Subject | [tip:x86/microcode] x86, microcode: Save an indentation level in reload_for_cpu |
| |
Commit-ID: 4dbf32c30f7e5379588a692c7bf80b05d9ef8026 Gitweb: http://git.kernel.org/tip/4dbf32c30f7e5379588a692c7bf80b05d9ef8026 Author: Borislav Petkov <borislav.petkov@amd.com> AuthorDate: Mon, 23 Jul 2012 19:05:53 +0200 Committer: H. Peter Anvin <hpa@linux.intel.com> CommitDate: Wed, 22 Aug 2012 16:14:08 -0700
x86, microcode: Save an indentation level in reload_for_cpu
Invert the uci->valid check so that the later block can be aligned on the first indentation level of the function. No functional change.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com> Link: http://lkml.kernel.org/r/1344361461-10076-3-git-send-email-bp@amd64.org Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> --- arch/x86/kernel/microcode_core.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c index 4873e62..63a9568 100644 --- a/arch/x86/kernel/microcode_core.c +++ b/arch/x86/kernel/microcode_core.c @@ -276,19 +276,18 @@ static struct platform_device *microcode_pdev; static int reload_for_cpu(int cpu) { struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + enum ucode_state ustate; int err = 0; - if (uci->valid) { - enum ucode_state ustate; - - ustate = microcode_ops->request_microcode_fw(cpu, µcode_pdev->dev); - if (ustate == UCODE_OK) - apply_microcode_on_target(cpu); - else - if (ustate == UCODE_ERROR) - err = -EINVAL; - } + if (!uci->valid) + return err; + ustate = microcode_ops->request_microcode_fw(cpu, µcode_pdev->dev); + if (ustate == UCODE_OK) + apply_microcode_on_target(cpu); + else + if (ustate == UCODE_ERROR) + err = -EINVAL; return err; }
| |