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>

2 files changed, 9 insertions, 9 deletions

diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c
index fcb1d59f7aec..f726d4c4e6dd 100644
--- a/arch/arm/mach-rpc/ecard.c
+++ b/arch/arm/mach-rpc/ecard.c
@@ -946,7 +946,7 @@ static int __init ecard_probe(int slot, unsigned irq, card_type_t type)
                 irq_set_chip_and_handler(ec->irq, &ecard_chip,
                                          handle_level_irq);
                 irq_set_chip_data(ec->irq, ec);
-                set_irq_flags(ec->irq, IRQF_VALID);
+                irq_clear_status_flags(ec->irq, IRQ_NOREQUEST);
         }
 
 #ifdef CONFIG_ARCH_RPC
diff --git a/arch/arm/mach-rpc/irq.c b/arch/arm/mach-rpc/irq.c
index 3e4fa849c64d..66502e6207fe 100644
--- a/arch/arm/mach-rpc/irq.c
+++ b/arch/arm/mach-rpc/irq.c
@@ -117,7 +117,7 @@ extern unsigned char rpc_default_fiq_start, rpc_default_fiq_end;
 
 void __init rpc_init_irq(void)
 {
-        unsigned int irq, flags;
+        unsigned int irq, clr, set = 0;
 
         iomd_writeb(0, IOMD_IRQMASKA);
         iomd_writeb(0, IOMD_IRQMASKB);
@@ -128,37 +128,37 @@ void __init rpc_init_irq(void)
                 &rpc_default_fiq_end - &rpc_default_fiq_start);
 
         for (irq = 0; irq < NR_IRQS; irq++) {
-                flags = IRQF_VALID;
+                clr = IRQ_NOREQUEST;
 
                 if (irq <= 6 || (irq >= 9 && irq <= 15))
-                        flags |= IRQF_PROBE;
+                        clr |= IRQ_NOPROBE;
 
                 if (irq == 21 || (irq >= 16 && irq <= 19) ||
                     irq == IRQ_KEYBOARDTX)
-                        flags |= IRQF_NOAUTOEN;
+                        set |= IRQ_NOAUTOEN;
 
                 switch (irq) {
                 case 0 ... 7:
                         irq_set_chip_and_handler(irq, &iomd_a_chip,
                                                  handle_level_irq);
-                        set_irq_flags(irq, flags);
+                        irq_modify_status(irq, clr, set);
                         break;
 
                 case 8 ... 15:
                         irq_set_chip_and_handler(irq, &iomd_b_chip,
                                                  handle_level_irq);
-                        set_irq_flags(irq, flags);
+                        irq_modify_status(irq, clr, set);
                         break;
 
                 case 16 ... 21:
                         irq_set_chip_and_handler(irq, &iomd_dma_chip,
                                                  handle_level_irq);
-                        set_irq_flags(irq, flags);
+                        irq_modify_status(irq, clr, set);
                         break;
 
                 case 64 ... 71:
                         irq_set_chip(irq, &iomd_fiq_chip);
-                        set_irq_flags(irq, IRQF_VALID);
+                        irq_modify_status(irq, clr, set);
                         break;
                 }
         }