From patchwork Sun Jul 12 14:26:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 6772601 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 546CF9F54C for ; Sun, 12 Jul 2015 14:30:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE3D4206A7 for ; Sun, 12 Jul 2015 14:30:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 809AD20678 for ; Sun, 12 Jul 2015 14:30:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZEIFH-00071C-23; Sun, 12 Jul 2015 14:28:43 +0000 Received: from mail-ob0-x22f.google.com ([2607:f8b0:4003:c01::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZEIE6-0006DP-6S for linux-arm-kernel@lists.infradead.org; Sun, 12 Jul 2015 14:27:30 +0000 Received: by obbop1 with SMTP id op1so215989289obb.2 for ; Sun, 12 Jul 2015 07:27:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ILUxGNitL+1fNZv9OPFzmg5To4ArRmRXKRkaE87kpWc=; b=qyRV+I9Bpb1y13lIHbus4pes+YU8SBvELC2abAc2/G6689O4Pg7KuYckipI7Hh7Qaw iQ7CP0SdlXeaJWIW64JS4jjc11iF+mKO6TY42lxlSB1keedgZEHWMZhnhGMGfF2ntaA+ HI80/B5YpFIlgmBHHeOdP3/M9ww5X5JXnpMfW+7KCRBWykCXYIjHcjAz7G+9C466lg69 VKOjc5sFgswe0ykWoMK+kSG+WZSwz/V3H7Xzdeqz3pqplpn0YqvFntFpZrXvYmEkhSS6 hrKiUtDCXG0AyzIgxnOwcbz0qIX/7gpI2+Bp1tLhCiIlXcuPu6ttBtRki/nQTVUom/p1 dSHg== X-Received: by 10.182.86.39 with SMTP id m7mr12111358obz.18.1436711229371; Sun, 12 Jul 2015 07:27:09 -0700 (PDT) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by smtp.googlemail.com with ESMTPSA id w8sm8090475oec.7.2015.07.12.07.27.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Jul 2015 07:27:08 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org, Russell King Subject: [PATCH v2 11/13] sh: kill off set_irq_flags usage Date: Sun, 12 Jul 2015 09:26:49 -0500 Message-Id: <1436711211-18223-12-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1436711211-18223-1-git-send-email-robh@kernel.org> References: <1436711211-18223-1-git-send-email-robh@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150712_072730_298750_A59A0D94 X-CRM114-Status: GOOD ( 12.15 ) X-Spam-Score: -2.1 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arm@kernel.org, Magnus Damm , linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP set_irq_flags is ARM specific with custom flags which have genirq equivalents. Convert drivers to use the genirq interfaces directly, so we can kill off set_irq_flags. The translation of flags is as follows: IRQF_VALID -> !IRQ_NOREQUEST IRQF_PROBE -> !IRQ_NOPROBE IRQF_NOAUTOEN -> IRQ_NOAUTOEN For IRQs managed by an irqdomain, the irqdomain core code handles clearing and setting IRQ_NOREQUEST already, so there is no need to do this in .map() functions and we can simply remove the set_irq_flags calls. Some users also set IRQ_NOPROBE and this has been maintained although it is not clear that is really needed. There appears to be a great deal of blind copy and paste of this code. Signed-off-by: Rob Herring Acked-by: Simon Horman Cc: Magnus Damm Cc: linux-sh@vger.kernel.org --- drivers/sh/intc/internals.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h index 7dff08e..897ffb1 100644 --- a/drivers/sh/intc/internals.h +++ b/drivers/sh/intc/internals.h @@ -99,15 +99,7 @@ static inline struct intc_desc_int *get_intc_desc(unsigned int irq) */ static inline void activate_irq(int irq) { -#ifdef CONFIG_ARM - /* ARM requires an extra step to clear IRQ_NOREQUEST, which it - * sets on behalf of every irq_chip. Also sets IRQ_NOPROBE. - */ - set_irq_flags(irq, IRQF_VALID); -#else - /* same effect on other architectures */ - irq_set_noprobe(irq); -#endif + irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE); } static inline int intc_handle_int_cmp(const void *a, const void *b)