From: Mark Rutland <[email protected]> Now that all users of the EFI runtime wrappers (arm,arm64,x86) have been migrated to the new setup/teardown macros, we don't need to support overridden {__,}efi_call_virt implementations.
This patch removes the unnecessary ifdefs. Signed-off-by: Mark Rutland <[email protected]> Cc: Leif Lindholm <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Ard Biesheuvel <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Russell King <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Will Deacon <[email protected]> Signed-off-by: Matt Fleming <[email protected]> --- drivers/firmware/efi/runtime-wrappers.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index 0677577bdaa1..b9ece374d4d3 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -40,7 +40,6 @@ * Restores the usual kernel environment once the call has returned. */ -#ifndef efi_call_virt #define efi_call_virt(f, args...) \ ({ \ efi_status_t __s; \ @@ -49,16 +48,13 @@ arch_efi_call_virt_teardown(); \ __s; \ }) -#endif -#ifndef __efi_call_virt #define __efi_call_virt(f, args...) \ ({ \ arch_efi_call_virt_setup(); \ arch_efi_call_virt(f, args); \ arch_efi_call_virt_teardown(); \ }) -#endif /* * According to section 7.1 of the UEFI spec, Runtime Services are not fully -- 2.7.3
