From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753719AbbIPU7t (ORCPT ); Wed, 16 Sep 2015 16:59:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49804 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753378AbbIPU7q (ORCPT ); Wed, 16 Sep 2015 16:59:46 -0400 Date: Wed, 16 Sep 2015 13:58:27 -0700 From: tip-bot for Rob Herring Message-ID: Cc: linux-kernel@vger.kernel.org, magnus.damm@gmail.com, horms@verge.net.au, robh@kernel.org, tglx@linutronix.de, linux@arm.linux.org.uk, hpa@zytor.com, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, magnus.damm@gmail.com, robh@kernel.org, horms@verge.net.au, tglx@linutronix.de, linux@arm.linux.org.uk, hpa@zytor.com, mingo@kernel.org In-Reply-To: <1440889285-5637-4-git-send-email-robh@kernel.org> References: <1440889285-5637-4-git-send-email-robh@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/urgent] sh: Kill off set_irq_flags usage Git-Commit-ID: 3e15135b98ecaa0228eb5dad42be7516cac38aa0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3e15135b98ecaa0228eb5dad42be7516cac38aa0 Gitweb: http://git.kernel.org/tip/3e15135b98ecaa0228eb5dad42be7516cac38aa0 Author: Rob Herring AuthorDate: Sat, 29 Aug 2015 18:01:23 -0500 Committer: Thomas Gleixner CommitDate: Wed, 16 Sep 2015 16:53:39 +0200 sh: Kill off set_irq_flags usage 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: linux-arm-kernel@lists.infradead.org Cc: linux-sh@vger.kernel.org Cc: Russell King Cc: Magnus Damm Link: http://lkml.kernel.org/r/1440889285-5637-4-git-send-email-robh@kernel.org Signed-off-by: Thomas Gleixner --- 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)