From patchwork Sat Aug 29 23:01:23 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: 7095831 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 2417A9F1CD for ; Sat, 29 Aug 2015 23:05:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AA17207F7 for ; Sat, 29 Aug 2015 23:05:12 +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 28E32207FB for ; Sat, 29 Aug 2015 23:05:11 +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 1ZVp8i-00065R-TQ; Sat, 29 Aug 2015 23:02:24 +0000 Received: from mail-ob0-x22a.google.com ([2607:f8b0:4003:c01::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZVp8Q-00061v-0p for linux-arm-kernel@lists.infradead.org; Sat, 29 Aug 2015 23:02:06 +0000 Received: by obkg7 with SMTP id g7so66975037obk.3 for ; Sat, 29 Aug 2015 16:01:45 -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=w8wyG18uZrxRLqwsfgtfEWWhQ0HIvhZR+AYEVk0Xsig=; b=JsL4B/OmUlghbVO/k58oeNuZL4OTqSInZUWcaKPV8nFISH+5VCvh9/Ug4E75RucHwV RLwSBmLJYeM/vgHGWvcQcljD2X4ueP+j+m1wSgXBFbsYam4rq/4gq/69Lna3FQc7JC8J A+k02n+4EhjjxntFIOhV7fnX2urkKEVqEB+YrN6WUWJLZlqFaUIeSixhHzqTDML6OKXd 9VqvYXN2VYLgL1Cx8H6m4tMdX8Z+gjUF2XLZuOpO7/JmGqPARR9nEHEPIs1DcGGm3VBq ty0KzdCYGishq5NEiog10wZiIbh9mpl8ud4BMn6vJEEv63VVxHLJMNWVZh5F3SKHkuYF hjTg== X-Received: by 10.182.19.228 with SMTP id i4mr9561245obe.82.1440889305085; Sat, 29 Aug 2015 16:01:45 -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 o10sm6929450oia.19.2015.08.29.16.01.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 29 Aug 2015 16:01:44 -0700 (PDT) From: Rob Herring To: Thomas Gleixner Subject: [RESEND PATCH v3 3/5] sh: kill off set_irq_flags usage Date: Sat, 29 Aug 2015 18:01:23 -0500 Message-Id: <1440889285-5637-4-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1440889285-5637-1-git-send-email-robh@kernel.org> References: <1440889285-5637-1-git-send-email-robh@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150829_160206_116565_AADE5296 X-CRM114-Status: GOOD ( 11.81 ) X-Spam-Score: -2.3 (--) 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: Rob Herring , Magnus Damm , Russell King , linux-arm-kernel@lists.infradead.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.1 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 modify 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..6ce7f0d 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_modify_status(irq, IRQ_NOREQUEST, IRQ_NOPROBE); } static inline int intc_handle_int_cmp(const void *a, const void *b)