2022-08-31 01:53:48

by Michel Lespinasse

Subject: [PATCH 3/4] Remove unused variable ret in efi_get_conf_table()

This avoids a build warning with CONFIG_EFI enabled.

Fixes: 61c14ceda840 (x86/compressed/acpi: Move EFI config table lookup to helper)
Signed-off-by: Michel Lespinasse <[email protected]>
---
arch/x86/boot/compressed/efi.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/x86/boot/compressed/efi.c b/arch/x86/boot/compressed/efi.c
index c42ee7874eb9..6ffd22710ed2 100644
--- a/arch/x86/boot/compressed/efi.c
+++ b/arch/x86/boot/compressed/efi.c
@@ -130,7 +130,6 @@ int efi_get_conf_table(struct boot_params *bp, unsigned long *cfg_tbl_pa,
{
unsigned long sys_tbl_pa;
enum efi_type et;
- int ret;

if (!cfg_tbl_pa || !cfg_tbl_len)
return -EINVAL;
--
2.20.1

2022-09-05 10:40:31

by Ard Biesheuvel

Subject: Re: [PATCH 3/4] Remove unused variable ret in efi_get_conf_table()

On Wed, 31 Aug 2022 at 03:13, Michel Lespinasse <[email protected]> wrote:
>
> This avoids a build warning with CONFIG_EFI enabled.
>
> Fixes: 61c14ceda840 (x86/compressed/acpi: Move EFI config table lookup to helper)
> Signed-off-by: Michel Lespinasse <[email protected]>

Can you combine this one with 2/4? (and add " inside the () on the fixes line)

> ---
> arch/x86/boot/compressed/efi.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/x86/boot/compressed/efi.c b/arch/x86/boot/compressed/efi.c
> index c42ee7874eb9..6ffd22710ed2 100644
> --- a/arch/x86/boot/compressed/efi.c
> +++ b/arch/x86/boot/compressed/efi.c
> @@ -130,7 +130,6 @@ int efi_get_conf_table(struct boot_params *bp, unsigned long *cfg_tbl_pa,
> {
> unsigned long sys_tbl_pa;
> enum efi_type et;
> - int ret;
>
> if (!cfg_tbl_pa || !cfg_tbl_len)
> return -EINVAL;
> --
> 2.20.1
>