Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd6697b8 authored by Zhenzhong Duan's avatar Zhenzhong Duan Committed by Thomas Gleixner
Browse files

x86/boot/efi: Remove unused variables 



Fix gcc warnings:

arch/x86/boot/compressed/eboot.c: In function 'make_boot_params':
arch/x86/boot/compressed/eboot.c:394:6: warning: unused variable 'i' [-Wunused-variable]
  int i;
      ^
arch/x86/boot/compressed/eboot.c:393:6: warning: unused variable 's1' [-Wunused-variable]
  u8 *s1;
      ^
arch/x86/boot/compressed/eboot.c:392:7: warning: unused variable 's2' [-Wunused-variable]
  u16 *s2;
       ^
arch/x86/boot/compressed/eboot.c:387:8: warning: unused variable 'options' [-Wunused-variable]
  void *options, *handle;
        ^
arch/x86/boot/compressed/eboot.c: In function 'add_e820ext':
arch/x86/boot/compressed/eboot.c:498:16: warning: unused variable 'size' [-Wunused-variable]
  unsigned long size;
                ^
arch/x86/boot/compressed/eboot.c:497:15: warning: unused variable 'status' [-Wunused-variable]
  efi_status_t status;
               ^
arch/x86/boot/compressed/eboot.c: In function 'exit_boot_func':
arch/x86/boot/compressed/eboot.c:681:15: warning: unused variable 'status' [-Wunused-variable]
  efi_status_t status;
               ^
arch/x86/boot/compressed/eboot.c:680:8: warning: unused variable 'nr_desc' [-Wunused-variable]
  __u32 nr_desc;
        ^
arch/x86/boot/compressed/eboot.c: In function 'efi_main':
arch/x86/boot/compressed/eboot.c:750:22: warning: unused variable 'image' [-Wunused-variable]
  efi_loaded_image_t *image;
                      ^

Signed-off-by: default avatarZhenzhong Duan <zhenzhong.duan@oracle.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/1563282957-26898-1-git-send-email-zhenzhong.duan@oracle.com
parent a0d14b89

arch/x86/boot/compressed/eboot.c

+1 −9
Original line number Diff line number Diff line
@@ -384,14 +384,11 @@ struct boot_params *make_boot_params(struct efi_config *c) 
	struct apm_bios_info *bi;

	struct setup_header *hdr;

	efi_loaded_image_t *image;

	void *options, *handle;

	void *handle;

	efi_guid_t proto = LOADED_IMAGE_PROTOCOL_GUID;

	int options_size = 0;

	efi_status_t status;

	char *cmdline_ptr;

	u16 *s2;

	u8 *s1;

	int i;

	unsigned long ramdisk_addr;

	unsigned long ramdisk_size;
@@ -494,8 +491,6 @@ static void add_e820ext(struct boot_params *params, 
			struct setup_data *e820ext, u32 nr_entries)

{

	struct setup_data *data;

	efi_status_t status;

	unsigned long size;



	e820ext->type = SETUP_E820_EXT;

	e820ext->len  = nr_entries * sizeof(struct boot_e820_entry);
@@ -677,8 +672,6 @@ static efi_status_t exit_boot_func(efi_system_table_t *sys_table_arg, 
				   void *priv)

{

	const char *signature;

	__u32 nr_desc;

	efi_status_t status;

	struct exit_boot_struct *p = priv;



	signature = efi_is_64bit() ? EFI64_LOADER_SIGNATURE
@@ -747,7 +740,6 @@ struct boot_params * 
efi_main(struct efi_config *c, struct boot_params *boot_params)

{

	struct desc_ptr *gdt = NULL;

	efi_loaded_image_t *image;

	struct setup_header *hdr = &boot_params->hdr;

	efi_status_t status;

	struct desc_struct *desc;