2022-09-21 09:44:40

by CGEL

Subject: [PATCH linux-next v2] ACPI: APEI: Remove the unneeded result variable

From: ye xingchen <[email protected]>

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 <[email protected]>
Signed-off-by: ye xingchen <[email protected]>
---
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)
--
2.25.1

2022-09-24 17:29:54

by Rafael J. Wysocki

Subject: Re: [PATCH linux-next v2] ACPI: APEI: Remove the unneeded result variable

On Wed, Sep 21, 2022 at 11:28 AM <[email protected]> wrote:
>
> From: ye xingchen <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: ye xingchen <[email protected]>
> ---
> 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!