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

Commit d17cab44 authored by Rob Herring's avatar Rob Herring Committed by Thomas Gleixner
Browse files

irqchip: 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: default avatarRob Herring <robh@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Lee Jones <lee@kernel.org>
Cc: Alexander Shiyan <shc_work@mail.ru>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: linux-rpi-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Link: http://lkml.kernel.org/r/1440889285-5637-3-git-send-email-robh@kernel.org


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ca0141de

drivers/irqchip/exynos-combiner.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int combiner_irq_domain_map(struct irq_domain *d, unsigned int irq, 


	irq_set_chip_and_handler(irq, &combiner_chip, handle_level_irq);

	irq_set_chip_data(irq, &combiner_data[hw >> 3]);

	set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

	irq_set_probe(irq);



	return 0;

}

drivers/irqchip/irq-armada-370-xp.c

+1 −2
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ static int armada_370_xp_msi_map(struct irq_domain *domain, unsigned int virq, 
{

	irq_set_chip_and_handler(virq, &armada_370_xp_msi_irq_chip,

				 handle_simple_irq);

	set_irq_flags(virq, IRQF_VALID);



	return 0;

}
@@ -317,7 +316,7 @@ static int armada_370_xp_mpic_irq_map(struct irq_domain *h, 
		irq_set_chip_and_handler(virq, &armada_370_xp_irq_chip,

					handle_level_irq);

	}

	set_irq_flags(virq, IRQF_VALID | IRQF_PROBE);

	irq_set_probe(virq);



	return 0;

}

drivers/irqchip/irq-bcm2835.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int __init armctrl_of_init(struct device_node *node, 
			BUG_ON(irq <= 0);

			irq_set_chip_and_handler(irq, &armctrl_chip,

				handle_level_irq);

			set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

			irq_set_probe(irq);

		}

	}

drivers/irqchip/irq-clps711x.c

+3 −3
Original line number Diff line number Diff line
@@ -132,14 +132,14 @@ static int __init clps711x_intc_irq_map(struct irq_domain *h, unsigned int virq, 
					irq_hw_number_t hw)

{

	irq_flow_handler_t handler = handle_level_irq;

	unsigned int flags = IRQF_VALID | IRQF_PROBE;

	unsigned int flags = 0;



	if (!clps711x_irqs[hw].flags)

		return 0;



	if (clps711x_irqs[hw].flags & CLPS711X_FLAG_FIQ) {

		handler = handle_bad_irq;

		flags |= IRQF_NOAUTOEN;

		flags |= IRQ_NOAUTOEN;

	} else if (clps711x_irqs[hw].eoi) {

		handler = handle_fasteoi_irq;

	}
@@ -149,7 +149,7 @@ static int __init clps711x_intc_irq_map(struct irq_domain *h, unsigned int virq, 
		writel_relaxed(0, clps711x_intc->base + clps711x_irqs[hw].eoi);



	irq_set_chip_and_handler(virq, &clps711x_intc_chip, handler);

	set_irq_flags(virq, flags);

	irq_modify_status(virq, IRQ_NOPROBE, flags);



	return 0;

}

drivers/irqchip/irq-gic-v3.c

+2 −3
Original line number Diff line number Diff line
@@ -752,13 +752,13 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq, 
		irq_set_percpu_devid(irq);

		irq_domain_set_info(d, irq, hw, chip, d->host_data,

				    handle_percpu_devid_irq, NULL, NULL);

		set_irq_flags(irq, IRQF_VALID | IRQF_NOAUTOEN);

		irq_set_status_flags(irq, IRQ_NOAUTOEN);

	}

	/* SPIs */

	if (hw >= 32 && hw < gic_data.irq_nr) {

		irq_domain_set_info(d, irq, hw, chip, d->host_data,

				    handle_fasteoi_irq, NULL, NULL);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

		irq_set_probe(irq);

	}

	/* LPIs */

	if (hw >= 8192 && hw < GIC_ID_NR) {
@@ -766,7 +766,6 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq, 
			return -EPERM;

		irq_domain_set_info(d, irq, hw, chip, d->host_data,

				    handle_fasteoi_irq, NULL, NULL);

		set_irq_flags(irq, IRQF_VALID);

	}



	return 0;