Commit bd1d7093 authored Jan 13, 2020 by Arnd Bergmann Committed by Ingo Molnar Jan 20, 2020

efi/libstub/x86: Fix unused-variable warning



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: 2732ea0d ("efi/libstub: Use a helper to iterate over a EFI handle array")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200113172245.27925-4-ardb@kernel.org

parent ac3c76cc

arch/x86/boot/compressed/eboot.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -118,7 +118,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;
		@@ -245,7 +244,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;

Admin message