Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932672AbcDYNrC (ORCPT ); Mon, 25 Apr 2016 09:47:02 -0400 Received: from foss.arm.com ([217.140.101.70]:46476 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932427AbcDYNq7 (ORCPT ); Mon, 25 Apr 2016 09:46:59 -0400 From: Mark Rutland To: linux-efi@vger.kernel.org Cc: ard.biesheuvel@linaro.org, catalin.marinas@arm.com, hpa@zytor.com, leif.lindholm@linaro.org, linux-arm-kernel@lists.infradead.org, linux@arm.linux.org.uk, linux-kernel@vger.kernel.org, mark.rutland@arm.com, matt@codeblueprint.co.uk, mingo@redhat.com, tglx@linutronix.de, will.deacon@arm.com Subject: [PATCHv3 5/5] efi/runtime-wrappers: remove ARCH_EFI_IRQ_FLAGS_MASK ifdef Date: Mon, 25 Apr 2016 14:46:34 +0100 Message-Id: <1461591994-14918-6-git-send-email-mark.rutland@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461591994-14918-1-git-send-email-mark.rutland@arm.com> References: <1461591994-14918-1-git-send-email-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1354 Lines: 40 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 Cc: Ard Biesheuvel Cc: Matt Fleming Cc: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- 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 1f0277e..a51b2c3 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -22,10 +22,6 @@ #include #include -/* - * 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; @@ -42,9 +38,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 */ #define efi_call_virt(f, args...) \ ({ \ -- 1.9.1