From patchwork Mon Apr 25 20:07:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 66619 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1233956qge; Mon, 25 Apr 2016 13:09:55 -0700 (PDT) X-Received: by 10.66.164.39 with SMTP id yn7mr51435399pab.107.1461614995355; Mon, 25 Apr 2016 13:09:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id un10si4438470pac.131.2016.04.25.13.09.55; Mon, 25 Apr 2016 13:09:55 -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 S964919AbcDYUJx (ORCPT + 29 others); Mon, 25 Apr 2016 16:09:53 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:37959 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933535AbcDYUIc (ORCPT ); Mon, 25 Apr 2016 16:08:32 -0400 Received: by mail-wm0-f49.google.com with SMTP id u206so145178730wme.1 for ; Mon, 25 Apr 2016 13:08:32 -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=CsoDta/2v0qlY+Ecw+sgK6gBjjjXrXU1ZjpD80JGgHk=; b=cuf1Vq7wP513xwwxJ2Lvelz1qNynHL9lXJxghGHUGXEKkWClVIv0g3QI8v8Oqq++nn aPMdoKp1KRvxn0yMFraYYCmmQgE/6PZXclxsJjR4kFYalPoNSHd8kr8Scj2qIsza+3nf Bq8cX9ywPL6YoddZENPBxO2WOnMMBOfVq2DR37ajQgXxwgkTc1XMd94VdlvWGlzdSgYh j0R0gjDlt0jsGNFJJ7+Rx9UcqkeyjlKKLJlmiYrhgBk0J/GqDYlUpvudnpkkT+aBSvHr 6eIisayspxf0MEGiyUI00DkmO163Qq72jLGv/uTV/kPVN+J3YIRmPAV83IdequLWUu/I 4qwg== 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=CsoDta/2v0qlY+Ecw+sgK6gBjjjXrXU1ZjpD80JGgHk=; b=MIe6ZbfqxVg+jObLCnQokXaKxBle10yUMQVXXDdq6yXz9hZtoKSSsw8OHd7QmhJ1zi J/YfLTxxPQrXa7HzJDTnC6aOQpH2NLciaNVTmQyn8PhTdx+0yZdqEntu1SE2+eVOfHQP Xn0qB4H2v+Q6/klYX2Drn9EfwjsyDQPjwpGpEJh4Ggt0F2GXD4SxMvhDlInjoov+CIHH TkkzSDxpqF9WEw6oy0a3gYhq+e2Q8LZoLN+QwW0N4asw64hXpKNvU8tNUJMA8kX94WjO R5LEPFJy6H34RCl5gh07Bv8MFagugQHlQP8lUetAScypA3+NAdbM39yahe6aRRkdar8c Vb8A== X-Gm-Message-State: AOPr4FW1x0xAFcwKkRotYFL4iWHhiEd9xdZ3oInbKSZnTIPKv6tVqXYzKPwdlVFj+rvkRA== X-Received: by 10.28.22.65 with SMTP id 62mr14614057wmw.32.1461614911606; Mon, 25 Apr 2016 13:08:31 -0700 (PDT) Received: from localhost (bcdc58e5.skybroadband.com. [188.220.88.229]) by smtp.gmail.com with ESMTPSA id o73sm20369426wme.16.2016.04.25.13.08.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Apr 2016 13:08:30 -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 40/40] efi/runtime-wrappers: Remove ARCH_EFI_IRQ_FLAGS_MASK ifdef Date: Mon, 25 Apr 2016 21:07:12 +0100 Message-Id: <1461614832-17633-41-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 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: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Catalin Marinas Cc: "H. Peter Anvin" Cc: Leif Lindholm Cc: Russell King Cc: Thomas Gleixner Cc: Will Deacon Signed-off-by: Matt Fleming --- drivers/firmware/efi/runtime-wrappers.c | 7 ------- 1 file changed, 7 deletions(-) -- 2.7.3 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 #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, 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