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: Rob 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: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
ca0141de74
commit
d17cab4451
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -890,11 +890,11 @@ 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);
|
||||
} else {
|
||||
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);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -307,11 +307,11 @@ static int hip04_irq_domain_map(struct irq_domain *d, unsigned int irq,
|
|||
irq_set_percpu_devid(irq);
|
||||
irq_set_chip_and_handler(irq, &hip04_irq_chip,
|
||||
handle_percpu_devid_irq);
|
||||
set_irq_flags(irq, IRQF_VALID | IRQF_NOAUTOEN);
|
||||
irq_set_status_flags(irq, IRQ_NOAUTOEN);
|
||||
} else {
|
||||
irq_set_chip_and_handler(irq, &hip04_irq_chip,
|
||||
handle_fasteoi_irq);
|
||||
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
|
||||
irq_set_probe(irq);
|
||||
}
|
||||
irq_set_chip_data(irq, d->host_data);
|
||||
return 0;
|
||||
|
|
|
@ -127,7 +127,7 @@ static int keystone_irq_map(struct irq_domain *h, unsigned int virq,
|
|||
|
||||
irq_set_chip_data(virq, kirq);
|
||||
irq_set_chip_and_handler(virq, &kirq->chip, handle_level_irq);
|
||||
set_irq_flags(virq, IRQF_VALID | IRQF_PROBE);
|
||||
irq_set_probe(virq);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -164,7 +164,6 @@ static int mmp_irq_domain_map(struct irq_domain *d, unsigned int irq,
|
|||
irq_hw_number_t hw)
|
||||
{
|
||||
irq_set_chip_and_handler(irq, &icu_irq_chip, handle_level_irq);
|
||||
set_irq_flags(irq, IRQF_VALID);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -234,7 +233,6 @@ void __init icu_init_irq(void)
|
|||
for (irq = 0; irq < 64; irq++) {
|
||||
icu_mask_irq(irq_get_irq_data(irq));
|
||||
irq_set_chip_and_handler(irq, &icu_irq_chip, handle_level_irq);
|
||||
set_irq_flags(irq, IRQF_VALID);
|
||||
}
|
||||
irq_set_default_host(icu_data[0].domain);
|
||||
set_handle_irq(mmp_handle_irq);
|
||||
|
@ -337,7 +335,6 @@ void __init mmp2_init_icu(void)
|
|||
irq_set_chip_and_handler(irq, &icu_irq_chip,
|
||||
handle_level_irq);
|
||||
}
|
||||
set_irq_flags(irq, IRQF_VALID);
|
||||
}
|
||||
irq_set_default_host(icu_data[0].domain);
|
||||
set_handle_irq(mmp2_handle_irq);
|
||||
|
|
|
@ -84,7 +84,6 @@ static int icoll_irq_domain_map(struct irq_domain *d, unsigned int virq,
|
|||
irq_hw_number_t hw)
|
||||
{
|
||||
irq_set_chip_and_handler(virq, &mxs_icoll_chip, handle_level_irq);
|
||||
set_irq_flags(virq, IRQF_VALID);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -353,7 +353,6 @@ static int intc_irqpin_irq_domain_map(struct irq_domain *h, unsigned int virq,
|
|||
irq_set_chip_data(virq, h->host_data);
|
||||
irq_set_lockdep_class(virq, &intc_irqpin_irq_lock_class);
|
||||
irq_set_chip_and_handler(virq, &p->irq_chip, handle_level_irq);
|
||||
set_irq_flags(virq, IRQF_VALID); /* kill me now */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -466,13 +466,11 @@ static int s3c24xx_irq_map(struct irq_domain *h, unsigned int virq,
|
|||
|
||||
irq_set_chip_data(virq, irq_data);
|
||||
|
||||
set_irq_flags(virq, IRQF_VALID);
|
||||
|
||||
if (parent_intc && irq_data->type != S3C_IRQTYPE_NONE) {
|
||||
if (irq_data->parent_irq > 31) {
|
||||
pr_err("irq-s3c24xx: parent irq %lu is out of range\n",
|
||||
irq_data->parent_irq);
|
||||
goto err;
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
parent_irq_data = &parent_intc->irqs[irq_data->parent_irq];
|
||||
|
@ -485,18 +483,12 @@ static int s3c24xx_irq_map(struct irq_domain *h, unsigned int virq,
|
|||
if (!irqno) {
|
||||
pr_err("irq-s3c24xx: could not find mapping for parent irq %lu\n",
|
||||
irq_data->parent_irq);
|
||||
goto err;
|
||||
return -EINVAL;
|
||||
}
|
||||
irq_set_chained_handler(irqno, s3c_irq_demux);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err:
|
||||
set_irq_flags(virq, 0);
|
||||
|
||||
/* the only error can result from bad mapping data*/
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static const struct irq_domain_ops s3c24xx_irq_ops = {
|
||||
|
@ -1174,8 +1166,6 @@ static int s3c24xx_irq_map_of(struct irq_domain *h, unsigned int virq,
|
|||
|
||||
irq_set_chip_data(virq, irq_data);
|
||||
|
||||
set_irq_flags(virq, IRQF_VALID);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ static int sun4i_irq_map(struct irq_domain *d, unsigned int virq,
|
|||
irq_hw_number_t hw)
|
||||
{
|
||||
irq_set_chip_and_handler(virq, &sun4i_irq_chip, handle_fasteoi_irq);
|
||||
set_irq_flags(virq, IRQF_VALID | IRQF_PROBE);
|
||||
irq_set_probe(virq);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -128,7 +128,7 @@ static int fpga_irqdomain_map(struct irq_domain *d, unsigned int irq,
|
|||
irq_set_chip_data(irq, f);
|
||||
irq_set_chip_and_handler(irq, &f->chip,
|
||||
handle_level_irq);
|
||||
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
|
||||
irq_set_probe(irq);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -201,7 +201,7 @@ static int vic_irqdomain_map(struct irq_domain *d, unsigned int irq,
|
|||
return -EPERM;
|
||||
irq_set_chip_and_handler(irq, &vic_chip, handle_level_irq);
|
||||
irq_set_chip_data(irq, v->base);
|
||||
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
|
||||
irq_set_probe(irq);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -167,7 +167,6 @@ static int vt8500_irq_map(struct irq_domain *h, unsigned int virq,
|
|||
irq_hw_number_t hw)
|
||||
{
|
||||
irq_set_chip_and_handler(virq, &vt8500_irq_chip, handle_level_irq);
|
||||
set_irq_flags(virq, IRQF_VALID);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -211,7 +211,6 @@ static void __init spear_shirq_register(struct spear_shirq *shirq,
|
|||
for (i = 0; i < shirq->nr_irqs; i++) {
|
||||
irq_set_chip_and_handler(shirq->virq_base + i,
|
||||
shirq->irq_chip, handle_simple_irq);
|
||||
set_irq_flags(shirq->virq_base + i, IRQF_VALID);
|
||||
irq_set_chip_data(shirq->virq_base + i, shirq);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue