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

efi/esrt: Clean up efi_esrt_init

Browse Source 
Remove an unused variable in __init efi_esrt_init().
Simplify a logical constraint.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Link: https://lore.kernel.org/r/20200223204557.114634-1-xypron.glpk@gmx.de
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Heinrich Schuchardt 2020-02-23 21:45:57 +01:00 committed by Ard Biesheuvel
parent f01dd5b3d1
commit 6d2576e480
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/firmware/efi/esrt.c
View File

@ -240,7 +240,6 @@ void __init efi_esrt_init(void)
{ {
void *va; void *va;
struct efi_system_resource_table tmpesrt; struct efi_system_resource_table tmpesrt;
struct efi_system_resource_entry_v1 *v1_entries;
size_t size, max, entry_size, entries_size; size_t size, max, entry_size, entries_size;
efi_memory_desc_t md; efi_memory_desc_t md;
int rc; int rc;
@ -288,14 +287,13 @@ void __init efi_esrt_init(void)
memcpy(&tmpesrt, va, sizeof(tmpesrt)); memcpy(&tmpesrt, va, sizeof(tmpesrt));
early_memunmap(va, size); early_memunmap(va, size);
if (tmpesrt.fw_resource_version == 1) { if (tmpesrt.fw_resource_version != 1) {
entry_size = sizeof (*v1_entries);
} else {
pr_err("Unsupported ESRT version %lld.\n", pr_err("Unsupported ESRT version %lld.\n",
tmpesrt.fw_resource_version); tmpesrt.fw_resource_version);
return; return;
} }
entry_size = sizeof(struct efi_system_resource_entry_v1);
if (tmpesrt.fw_resource_count > 0 && max - size < entry_size) { if (tmpesrt.fw_resource_count > 0 && max - size < entry_size) {
pr_err("ESRT memory map entry can only hold the header. (max: %zu size: %zu)\n", pr_err("ESRT memory map entry can only hold the header. (max: %zu size: %zu)\n",
max - size, entry_size); max - size, entry_size);