[PATCH 0/4] Remove unused variables resulting in CONFIG_EFI warnings

[PATCH 0/4] Remove unused variables resulting in CONFIG_EFI warnings

[Michel Lespinasse]

This small series removes a few unused variables.
This fixes some CONFIG_EFI build warnings that were introduced in v5.19-rc1.

Is there any chance these could be pushed into v6.0 ?
If not, could you queue these for the next release cycle ?

Michel Lespinasse (4):
  Remove unused variable et in efi_get_system_table()
  Remove unused variable nr_tables in efi_get_rsdp_addr()
  Remove unused variable ret in efi_get_conf_table()
  Remove unused variable ret in __efi_get_rsdp_addr()

 arch/x86/boot/compressed/acpi.c | 2 --
 arch/x86/boot/compressed/efi.c  | 2 --
 2 files changed, 4 deletions(-)


base-commit: b90cb1053190353cc30f0fef0ef1f378ccc063c5
-- 
2.20.1

[PATCH 1/4] Remove unused variable et in efi_get_system_table()

[Michel Lespinasse]

This avoids a build warning with CONFIG_EFI enabled.

Fixes: 7c4146e88855 (x86/compressed/acpi: Move EFI detection to helper)
Signed-off-by: Michel Lespinasse <michel@lespinasse.org>
---
 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 6edd034b0b30..c42ee7874eb9 100644
--- a/arch/x86/boot/compressed/efi.c
+++ b/arch/x86/boot/compressed/efi.c
@@ -59,7 +59,6 @@ unsigned long efi_get_system_table(struct boot_params *bp)
 {
 	unsigned long sys_tbl_pa;
 	struct efi_info *ei;
-	enum efi_type et;
 
 	/* Get systab from boot params. */
 	ei = &bp->efi_info;
-- 
2.20.1

[PATCH 2/4] Remove unused variable nr_tables in efi_get_rsdp_addr()

[Michel Lespinasse]

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 <michel@lespinasse.org>
---
 arch/x86/boot/compressed/acpi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c
index 9caf89063e77..83a7977ef56f 100644
--- a/arch/x86/boot/compressed/acpi.c
+++ b/arch/x86/boot/compressed/acpi.c
@@ -52,7 +52,6 @@ static acpi_physical_address efi_get_rsdp_addr(void)
 	unsigned long cfg_tbl_pa = 0;
 	unsigned int cfg_tbl_len;
 	unsigned long systab_pa;
-	unsigned int nr_tables;
 	enum efi_type et;
 	int ret;
 
-- 
2.20.1

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

[Michel Lespinasse]

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 <michel@lespinasse.org>
---
 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

[PATCH 4/4] Remove unused variable ret in __efi_get_rsdp_addr()

[Michel Lespinasse]

This avoids a build warning with CONFIG_EFI enabled.

Fixes: dee602dd5d14 (x86/compressed/acpi: Move EFI vendor table lookup to helper)
Signed-off-by: Michel Lespinasse <michel@lespinasse.org>
---
 arch/x86/boot/compressed/acpi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c
index 83a7977ef56f..21febd9f21ab 100644
--- a/arch/x86/boot/compressed/acpi.c
+++ b/arch/x86/boot/compressed/acpi.c
@@ -24,7 +24,6 @@ __efi_get_rsdp_addr(unsigned long cfg_tbl_pa, unsigned int cfg_tbl_len)
 {
 #ifdef CONFIG_EFI
 	unsigned long rsdp_addr;
-	int ret;
 
 	/*
 	 * Search EFI system tables for RSDP. Preferred is ACPI_20_TABLE_GUID to
-- 
2.20.1

Re: [PATCH 1/4] Remove unused variable et in efi_get_system_table()

[Ard Biesheuvel]

On Wed, 31 Aug 2022 at 03:12, Michel Lespinasse <michel@lespinasse.org> wrote:
>
> This avoids a build warning with CONFIG_EFI enabled.
>
> Fixes: 7c4146e88855 (x86/compressed/acpi: Move EFI detection to helper)

Please use " inside the ()

Also, the commit id looks wrong to me.

> Signed-off-by: Michel Lespinasse <michel@lespinasse.org>
> ---
>  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 6edd034b0b30..c42ee7874eb9 100644
> --- a/arch/x86/boot/compressed/efi.c
> +++ b/arch/x86/boot/compressed/efi.c
> @@ -59,7 +59,6 @@ unsigned long efi_get_system_table(struct boot_params *bp)
>  {
>         unsigned long sys_tbl_pa;
>         struct efi_info *ei;
> -       enum efi_type et;
>
>         /* Get systab from boot params. */
>         ei = &bp->efi_info;
> --
> 2.20.1
>

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

[Ard Biesheuvel]

On Wed, 31 Aug 2022 at 03:13, Michel Lespinasse <michel@lespinasse.org> 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 <michel@lespinasse.org>

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
>