[PATCHv2 5/6] efi/runtime-wrappers: remove redundant ifdefs

Mark Rutland
2016-04-22T13:51:22Z

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 <mark.rutland@arm.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: linux-efi at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
---
drivers/firmware/efi/runtime-wrappers.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c
index 1b9fa54..a2c8e70 100644
--- a/drivers/firmware/efi/runtime-wrappers.c
+++ b/drivers/firmware/efi/runtime-wrappers.c
@@ -20,8 +20,6 @@
#include <linux/spinlock.h>
#include <asm/efi.h>

-
-#ifndef efi_call_virt
#define efi_call_virt(f, args...) \
({ \
efi_status_t __s; \
@@ -30,16 +28,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
--
1.9.1