From patchwork Mon Apr 25 20:07:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 66620 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1234197qge; Mon, 25 Apr 2016 13:10:25 -0700 (PDT) X-Received: by 10.66.218.196 with SMTP id pi4mr51120574pac.147.1461615025062; Mon, 25 Apr 2016 13:10:25 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q71si7286223pfa.49.2016.04.25.13.10.24; Mon, 25 Apr 2016 13:10:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeblueprint-co-uk.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965158AbcDYUKV (ORCPT + 29 others); 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 Received: by mail-wm0-f48.google.com with SMTP id e201so98097997wme.0 for ; Mon, 25 Apr 2016 13:08:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeblueprint-co-uk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hJeyA+QEQOmcV3Pbuab/8iDW4bBUQc1Q5Fn0ni4LcIM=; b=a+3Aq1A7FGgRM9sy3IFk+3Ne2mBvKCv90uQgkQvnVhFTEQb5efFEYp460eWBzSumXw 9rpVV4oJQ90+zMDIFB3g72FzRbN8CYUOPaOqzc/ials9URUtcwwCjWskbEA2dbVXICzv 6z7KJNxzerrx4WziB5RYY4nxzrCJWPAuyQV0XkcLEBsm2S0DOUE2mPR6Rop8NCWHNq49 hBjfHzvXPNfzgVb2/muDjRoetiAjHB+yCyQ/0izIAI8PrTzgMFBzqMeyU4Z3WDAGbsUa 7WULu3JhQXlX6SZYtr39Dw33L7V9N3E40YvWwqH9YUvFMkE/pw64Iu/B+75WQtQEyvzF SMPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hJeyA+QEQOmcV3Pbuab/8iDW4bBUQc1Q5Fn0ni4LcIM=; b=iv1wdOfDqMA7zQd/4rsHJQu2+z5InEI01FW+ODEqM2hdW+tgjzhiKrYI1gFe6vVasY /Z4BbtRmsVTCeWGUK9gIvRR1sVfgVh3Injd8q366nH227sYoSHtE0HhYplsHYWH+fpYD f1GyF9EXxNgMap5NaNmm3m1j/yp86qqH0Te/aIaImg6Cnw63uJNMmcW+nJmuWQ8fqMnZ S2n8/Zos6kZAeNjwOkypd1uJ+wzauRN/85ZqsVwIwxBeDhqECktC5slJEvPYE0tLn/oN kP82rtlomVK6gT3h/VkIzeTAuCxDBPezD63p+bJUgir2Mpjo6Weol8xe7hojXP5T+nDZ JRqA== X-Gm-Message-State: AOPr4FWfQJgOv+zkfLhhjh+J1PN+HNm7spoZoxmXy5ViZlv8C2q9JAb2ENAF0QqvncQ7ZA== X-Received: by 10.28.22.65 with SMTP id 62mr14613537wmw.32.1461614903323; Mon, 25 Apr 2016 13:08:23 -0700 (PDT) Received: from localhost (bcdc58e5.skybroadband.com. [188.220.88.229]) by smtp.gmail.com with ESMTPSA id hk7sm25206407wjb.5.2016.04.25.13.08.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Apr 2016 13:08:22 -0700 (PDT) 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 Precedence: bulk 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(-) -- 2.7.3 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