lkml.org 
[lkml]   [2018]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch v3 01/13] x86/speculation: Clean up spectre_v2_parse_cmdline
    Date
    Remove unnecessary else statement in spectre_v2_parse_cmdline
    to save an indent.

    Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
    ---
    arch/x86/kernel/cpu/bugs.c | 27 +++++++++++++--------------
    1 file changed, 13 insertions(+), 14 deletions(-)

    diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
    index fe32103..bbda9b6 100644
    --- a/arch/x86/kernel/cpu/bugs.c
    +++ b/arch/x86/kernel/cpu/bugs.c
    @@ -283,22 +283,21 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)

    if (cmdline_find_option_bool(boot_command_line, "nospectre_v2"))
    return SPECTRE_V2_CMD_NONE;
    - else {
    - ret = cmdline_find_option(boot_command_line, "spectre_v2", arg, sizeof(arg));
    - if (ret < 0)
    - return SPECTRE_V2_CMD_AUTO;

    - for (i = 0; i < ARRAY_SIZE(mitigation_options); i++) {
    - if (!match_option(arg, ret, mitigation_options[i].option))
    - continue;
    - cmd = mitigation_options[i].cmd;
    - break;
    - }
    + ret = cmdline_find_option(boot_command_line, "spectre_v2", arg, sizeof(arg));
    + if (ret < 0)
    + return SPECTRE_V2_CMD_AUTO;

    - if (i >= ARRAY_SIZE(mitigation_options)) {
    - pr_err("unknown option (%s). Switching to AUTO select\n", arg);
    - return SPECTRE_V2_CMD_AUTO;
    - }
    + for (i = 0; i < ARRAY_SIZE(mitigation_options); i++) {
    + if (!match_option(arg, ret, mitigation_options[i].option))
    + continue;
    + cmd = mitigation_options[i].cmd;
    + break;
    + }
    +
    + if (i >= ARRAY_SIZE(mitigation_options)) {
    + pr_err("unknown option (%s). Switching to AUTO select\n", arg);
    + return SPECTRE_V2_CMD_AUTO;
    }

    if ((cmd == SPECTRE_V2_CMD_RETPOLINE ||
    --
    2.9.4
    \
     
     \ /
      Last update: 2018-10-17 20:34    [W:2.512 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site