Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8d36d5d authored Jul 27, 2015 by Rob Herring Committed by Olof Johansson Jul 28, 2015

ARM: 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 <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Imre Kaloz <kaloz@openwrt.org>
Acked-by: Krzysztof Halasa <khalasa@piap.pl>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Roland Stigge <stigge@antcom.de>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Simtec Linux Team <linux@simtec.co.uk>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org
Tested-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

parent 19c233b7

arch/arm/common/it8152.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ void it8152_init_irq(void)
		for (irq = IT8152_IRQ(0); irq <= IT8152_LAST_IRQ; irq++) {
		irq_set_chip_and_handler(irq, &it8152_irq_chip,
		handle_level_irq);
		set_irq_flags(irq, IRQF_VALID \| IRQF_PROBE);
		irq_clear_status_flags(irq, IRQ_NOREQUEST \| IRQ_NOPROBE);
		}
		}

arch/arm/common/locomo.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ static void locomo_setup_irq(struct locomo *lchip)
		for ( ; irq <= lchip->irq_base + 3; irq++) {
		irq_set_chip_and_handler(irq, &locomo_chip, handle_level_irq);
		irq_set_chip_data(irq, lchip);
		set_irq_flags(irq, IRQF_VALID \| IRQF_PROBE);
		irq_clear_status_flags(irq, IRQ_NOREQUEST \| IRQ_NOPROBE);
		}
		}

arch/arm/common/sa1111.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -486,7 +486,7 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)
		irq_set_chip_and_handler(irq, &sa1111_low_chip,
		handle_edge_irq);
		irq_set_chip_data(irq, sachip);
		set_irq_flags(irq, IRQF_VALID \| IRQF_PROBE);
		irq_clear_status_flags(irq, IRQ_NOREQUEST \| IRQ_NOPROBE);
		}

		for (i = AUDXMTDMADONEA; i <= IRQ_S1_BVD1_STSCHG; i++) {
		@@ -494,7 +494,7 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base)
		irq_set_chip_and_handler(irq, &sa1111_high_chip,
		handle_edge_irq);
		irq_set_chip_data(irq, sachip);
		set_irq_flags(irq, IRQF_VALID \| IRQF_PROBE);
		irq_clear_status_flags(irq, IRQ_NOREQUEST \| IRQ_NOPROBE);
		}

		/*

arch/arm/mach-davinci/cp_intc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ static int cp_intc_host_map(struct irq_domain *h, unsigned int virq,
		pr_debug("cp_intc_host_map(%d, 0x%lx)\n", virq, hw);

		irq_set_chip(virq, &cp_intc_irq_chip);
		set_irq_flags(virq, IRQF_VALID \| IRQF_PROBE);
		irq_set_probe(virq);
		irq_set_handler(virq, handle_edge_irq);
		return 0;
		}

arch/arm/mach-dove/irq.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ void __init dove_init_irq(void)
		for (i = IRQ_DOVE_PMU_START; i < NR_IRQS; i++) {
		irq_set_chip_and_handler(i, &pmu_irq_chip, handle_level_irq);
		irq_set_status_flags(i, IRQ_LEVEL);
		set_irq_flags(i, IRQF_VALID);
		irq_clear_status_flags(i, IRQ_NOREQUEST);
		}
		irq_set_chained_handler(IRQ_DOVE_PMU, pmu_irq_handler);
		}