On Wed, 8 Jan 2020 at 14:54, Arnd Bergmann <arnd@xxxxxxxx> wrote:
>
> The only users of these got removed, so they also need to be
> removed to avoid warnings:
>
> arch/x86/boot/compressed/eboot.c: In function 'setup_efi_pci':
> arch/x86/boot/compressed/eboot.c:117:16: error: unused variable 'nr_pci' [-Werror=unused-variable]
> unsigned long nr_pci;
> ^~~~~~
> arch/x86/boot/compressed/eboot.c: In function 'setup_uga':
> arch/x86/boot/compressed/eboot.c:244:16: error: unused variable 'nr_ugas' [-Werror=unused-variable]
> unsigned long nr_ugas;
> ^~~~~~~
>
> Fixes: 2732ea0d5c0a ("efi/libstub: Use a helper to iterate over a EFI handle array")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Oops
Acked-by: Ard Biesheuvel <ardb@xxxxxxxxxx>
or I can add it to my next batch of EFI changes at the end of the week.
> ---
> arch/x86/boot/compressed/eboot.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
> index da04948d75ed..57dfdc53d714 100644
> --- a/arch/x86/boot/compressed/eboot.c
> +++ b/arch/x86/boot/compressed/eboot.c
> @@ -114,7 +114,6 @@ static void setup_efi_pci(struct boot_params *params)
> void **pci_handle = NULL;
> efi_guid_t pci_proto = EFI_PCI_IO_PROTOCOL_GUID;
> unsigned long size = 0;
> - unsigned long nr_pci;
> struct setup_data *data;
> efi_handle_t h;
> int i;
> @@ -241,7 +240,6 @@ setup_uga(struct screen_info *si, efi_guid_t *uga_proto, unsigned long size)
> u32 width, height;
> void **uga_handle = NULL;
> efi_uga_draw_protocol_t *uga = NULL, *first_uga;
> - unsigned long nr_ugas;
> efi_handle_t handle;
> int i;
>
> --
> 2.20.0
>
