Commit 4eb8320b authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

efi: Move arch_tables check to caller 



Instead of making match_config_table() test its table_types pointer for
NULL-ness, omit the call entirely if no arch_tables pointer was provided
to efi_config_parse_tables().

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 4e9a0f73

drivers/firmware/efi/efi.c

+8 −10
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ static __init int match_config_table(const efi_guid_t *guid, 
{

	int i;



	if (table_types) {

	for (i = 0; efi_guidcmp(table_types[i].guid, NULL_GUID); i++) {

		if (!efi_guidcmp(*guid, table_types[i].guid)) {

			*(table_types[i].ptr) = table;
@@ -535,7 +534,6 @@ static __init int match_config_table(const efi_guid_t *guid, 
			return 1;

		}

	}

	}



	return 0;

}
@@ -570,7 +568,7 @@ int __init efi_config_parse_tables(const efi_config_table_t *config_tables, 
			table = tbl32[i].table;

		}



		if (!match_config_table(guid, table, common_tables))

		if (!match_config_table(guid, table, common_tables) && arch_tables)

			match_config_table(guid, table, arch_tables);

	}

	pr_cont("\n");