Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220921092834.230356-1-ye.xingchen@zte.com.cn>
In-Reply-To: <20220921092834.230356-1-ye.xingchen@zte.com.cn>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Sat, 24 Sep 2022 18:52:15 +0200
Message-ID: <CAJZ5v0jVgb3dzqUj5QLgxcJacOxGWqJm4BvyO081cHBpV63XRg@mail.gmail.com>
Subject: Re: [PATCH linux-next v2] ACPI: APEI: Remove the unneeded result variable
To:     cgel.zte@gmail.com
Cc:     "Rafael J. Wysocki" <rafael@kernel.org>,
        Len Brown <lenb@kernel.org>, James Morse <james.morse@arm.com>,
        Tony Luck <tony.luck@intel.com>,
        Borislav Petkov <bp@alien8.de>,
        Kees Cook <keescook@chromium.org>,
        Anton Vorontsov <anton@enomsg.org>,
        Colin Cross <ccross@android.com>,
        Jakob Koschel <jakobkoschel@gmail.com>,
        Xiang wangx <wangxiang@cdjrlc.com>,
        ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        ye xingchen <ye.xingchen@zte.com.cn>,
        Zeal Robot <zealci@zte.com.cn>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Sep 21, 2022 at 11:28 AM <cgel.zte@gmail.com> wrote:
>
> From: ye xingchen <ye.xingchen@zte.com.cn>
>
> Return the value erst_get_record_id_begin() and apei_exec_write_register()
>  directly instead of storing it in another redundant variable.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: ye xingchen <ye.xingchen@zte.com.cn>
> ---
> v1 -> v2
> combine the patchs in APEI.
>  drivers/acpi/apei/apei-base.c | 5 +----
>  drivers/acpi/apei/erst.c      | 6 +-----
>  2 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
> index 9f49272cad39..9b52482b4ed5 100644
> --- a/drivers/acpi/apei/apei-base.c
> +++ b/drivers/acpi/apei/apei-base.c
> @@ -125,12 +125,9 @@ EXPORT_SYMBOL_GPL(apei_exec_write_register);
>  int apei_exec_write_register_value(struct apei_exec_context *ctx,
>                                    struct acpi_whea_header *entry)
>  {
> -       int rc;
> -
>         ctx->value = entry->value;
> -       rc = apei_exec_write_register(ctx, entry);
>
> -       return rc;
> +       return apei_exec_write_register(ctx, entry);
>  }
>  EXPORT_SYMBOL_GPL(apei_exec_write_register_value);
>
> diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
> index 31b077eedb58..247989060e29 100644
> --- a/drivers/acpi/apei/erst.c
> +++ b/drivers/acpi/apei/erst.c
> @@ -1020,14 +1020,10 @@ static int reader_pos;
>
>  static int erst_open_pstore(struct pstore_info *psi)
>  {
> -       int rc;
> -
>         if (erst_disable)
>                 return -ENODEV;
>
> -       rc = erst_get_record_id_begin(&reader_pos);
> -
> -       return rc;
> +       return erst_get_record_id_begin(&reader_pos);
>  }
>
>  static int erst_close_pstore(struct pstore_info *psi)
> --

Applied as 6.1 material with some edits in the subject and changelog, thanks!