From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965156AbcDYUKV (ORCPT ); Mon, 25 Apr 2016 16:10:21 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:35668 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965058AbcDYUIY (ORCPT ); Mon, 25 Apr 2016 16:08:24 -0400 From: Matt Fleming To: Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Mark Rutland , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Matt Fleming , Catalin Marinas , Leif Lindholm , Russell King , Will Deacon Subject: [PATCH 35/40] efi/runtime-wrappers: Remove redundant ifdefs Date: Mon, 25 Apr 2016 21:07:07 +0100 Message-Id: <1461614832-17633-36-git-send-email-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1461614832-17633-1-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-1-git-send-email-matt@codeblueprint.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Rutland 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 Cc: Leif Lindholm Cc: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Ard Biesheuvel Cc: Catalin Marinas Cc: "H. Peter Anvin" Cc: Russell King Cc: Thomas Gleixner Cc: Will Deacon Signed-off-by: Matt Fleming --- drivers/firmware/efi/runtime-wrappers.c | 4 ---- 1 file changed, 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 -- 2.7.3