efi/esrt: Clean up efi_esrt_init (6d2576e4) · Commits · 戴 / test

Remove an unused variable in __init efi_esrt_init(). Simplify a logical constraint. Signed-off-by:

drivers/firmware/efi/esrt.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -240,7 +240,6 @@ void __init efi_esrt_init(void)
		{
		void *va;
		struct efi_system_resource_table tmpesrt;
		struct efi_system_resource_entry_v1 *v1_entries;
		size_t size, max, entry_size, entries_size;
		efi_memory_desc_t md;
		int rc;
		@@ -288,14 +287,13 @@ void __init efi_esrt_init(void)
		memcpy(&tmpesrt, va, sizeof(tmpesrt));
		early_memunmap(va, size);

		if (tmpesrt.fw_resource_version == 1) {
		entry_size = sizeof (*v1_entries);
		} else {
		if (tmpesrt.fw_resource_version != 1) {
		pr_err("Unsupported ESRT version %lld.\n",
		tmpesrt.fw_resource_version);
		return;
		}

		entry_size = sizeof(struct efi_system_resource_entry_v1);
		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",
		max - size, entry_size);