summaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2016-04-25 21:07:07 +0100
committerIngo Molnar <mingo@kernel.org>2016-04-28 11:34:10 +0200
commitd9c6e1d0faec6d750b5cc08d036e9c3da6e8e50c (patch)
treed88d815743737f58ce90899483ac9f93d5457ab9 /drivers/firmware
parentbc25f9dba149a1392b016a6d35300c8d79177298 (diff)
downloadlinux-d9c6e1d0faec6d750b5cc08d036e9c3da6e8e50c.tar.gz
linux-d9c6e1d0faec6d750b5cc08d036e9c3da6e8e50c.tar.bz2
linux-d9c6e1d0faec6d750b5cc08d036e9c3da6e8e50c.zip
efi/runtime-wrappers: Remove redundant #ifdefs
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> Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Leif Lindholm <leif.lindholm@linaro.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Will Deacon <will.deacon@arm.com> Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1461614832-17633-36-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/efi/runtime-wrappers.c4
1 files changed, 0 insertions, 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