iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/efi: Delete superfluous global variables

Browse Source 
There's no need to save the runtime map details in global variables, the
values are only required to pass to efi_runtime_map_setup().

And because 'nr_efi_runtime_map' isn't needed, get_nr_runtime_map() can
be deleted along with 'efi_data_len'.

Cc: Dave Young <dyoung@redhat.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
This commit is contained in:
Matt Fleming 2013-12-21 16:09:46 +00:00
parent 77ea8c9489
commit 518548abd6
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/platform/efi/efi.c
View File

@ -76,10 +76,7 @@ static __initdata efi_config_table_type_t arch_tables[] = {
{NULL_GUID, NULL, NULL}, {NULL_GUID, NULL, NULL},
}; };
static void *efi_runtime_map;
static int nr_efi_runtime_map;
u64 efi_setup; /* efi setup_data physical address */ u64 efi_setup; /* efi setup_data physical address */
u32 efi_data_len; /* efi setup_data payload length */
/* /*
* Returns 1 if 'facility' is enabled, 0 otherwise. * Returns 1 if 'facility' is enabled, 0 otherwise.
@ -702,15 +699,6 @@ out:
return ret; return ret;
} }
static void get_nr_runtime_map(void)
{
if (!efi_setup)
return;
nr_efi_runtime_map = (efi_data_len - sizeof(struct efi_setup_data)) /
sizeof(efi_memory_desc_t);
}
void __init efi_init(void) void __init efi_init(void)
{ {
efi_char16_t *c16; efi_char16_t *c16;
@ -718,7 +706,6 @@ void __init efi_init(void)
int i = 0; int i = 0;
void *tmp; void *tmp;
get_nr_runtime_map();
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
if (boot_params.efi_info.efi_systab_hi || if (boot_params.efi_info.efi_systab_hi ||
boot_params.efi_info.efi_memmap_hi) { boot_params.efi_info.efi_memmap_hi) {
@ -933,10 +920,7 @@ static int __init save_runtime_map(void)
count++; count++;
} }
efi_runtime_map = q; efi_runtime_map_setup(q, count, memmap.desc_size);
nr_efi_runtime_map = count;
efi_runtime_map_setup(efi_runtime_map, nr_efi_runtime_map,
boot_params.efi_info.efi_memdesc_size);
return 0; return 0;
out: out:

1
arch/x86/platform/efi/efi_64.c
View File

@ -232,5 +232,4 @@ void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,
void __init parse_efi_setup(u64 phys_addr, u32 data_len) void __init parse_efi_setup(u64 phys_addr, u32 data_len)
{ {
efi_setup = phys_addr + sizeof(struct setup_data); efi_setup = phys_addr + sizeof(struct setup_data);
efi_data_len = data_len - sizeof(struct setup_data);
} }