aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2016-04-25 16:07:12 -0400
committerIngo Molnar <mingo@kernel.org>2016-04-28 05:34:13 -0400
commit0cf0223c8370af0fcedb15a408d3c17bb4b9e21d (patch)
treec8dfaa22ef1eaab8ac3f8514ecbe1e7d6fe68036 /drivers/firmware
parent9788375dc4cdc9c00645028384fb40402eab774f (diff)
efi/runtime-wrappers: Remove ARCH_EFI_IRQ_FLAGS_MASK #ifdef
Now that arm, arm64, and x86 all provide ARCH_EFI_IRQ_FLAGS_MASK, we can get rid of the trivial and now unused implementation of efi_call_virt_check_flags(). 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-41-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.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c
index 89dcdb3a16a2..23bef6bb73ee 100644
--- a/drivers/firmware/efi/runtime-wrappers.c
+++ b/drivers/firmware/efi/runtime-wrappers.c
@@ -22,10 +22,6 @@
22#include <linux/stringify.h> 22#include <linux/stringify.h>
23#include <asm/efi.h> 23#include <asm/efi.h>
24 24
25/*
26 * Temporary scaffolding until all users provide ARCH_EFI_IRQ_FLAGS_MASK.
27 */
28#ifdef ARCH_EFI_IRQ_FLAGS_MASK
29static void efi_call_virt_check_flags(unsigned long flags, const char *call) 25static void efi_call_virt_check_flags(unsigned long flags, const char *call)
30{ 26{
31 unsigned long cur_flags, mismatch; 27 unsigned long cur_flags, mismatch;
@@ -41,9 +37,6 @@ static void efi_call_virt_check_flags(unsigned long flags, const char *call)
41 flags, cur_flags, call); 37 flags, cur_flags, call);
42 local_irq_restore(flags); 38 local_irq_restore(flags);
43} 39}
44#else /* ARCH_EFI_IRQ_FLAGS_MASK */
45static inline void efi_call_virt_check_flags(unsigned long flags, const char *call) {}
46#endif /* ARCH_EFI_IRQ_FLAGS_MASK */
47 40
48/* 41/*
49 * Arch code can implement the following three template macros, avoiding 42 * Arch code can implement the following three template macros, avoiding