From: Mark Rutland <[email protected]> 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 <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Catalin Marinas <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Leif Lindholm <[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 | 7 ------- 1 file changed, 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 @@ #include <linux/stringify.h> #include <asm/efi.h> -/* - * Temporary scaffolding until all users provide ARCH_EFI_IRQ_FLAGS_MASK. - */ -#ifdef ARCH_EFI_IRQ_FLAGS_MASK static void efi_call_virt_check_flags(unsigned long flags, const char *call) { unsigned long cur_flags, mismatch; @@ -41,9 +37,6 @@ static void efi_call_virt_check_flags(unsigned long flags, const char *call) flags, cur_flags, call); local_irq_restore(flags); } -#else /* ARCH_EFI_IRQ_FLAGS_MASK */ -static inline void efi_call_virt_check_flags(unsigned long flags, const char *call) {} -#endif /* ARCH_EFI_IRQ_FLAGS_MASK */ /* * Arch code can implement the following three template macros, avoiding -- 2.7.3
