Commit 9bd09f34 authored by Rob Herring's avatar Rob Herring Committed by Lee Jones
Browse files

mfd: 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>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 035faf4b

drivers/mfd/88pm860x-core.c

+0 −4
Original line number Diff line number Diff line
@@ -558,11 +558,7 @@ static int pm860x_irq_domain_map(struct irq_domain *d, unsigned int virq, 
	irq_set_chip_data(virq, d->host_data);

	irq_set_chip_and_handler(virq, &pm860x_irq_chip, handle_edge_irq);

	irq_set_nested_thread(virq, 1);

#ifdef CONFIG_ARM

	set_irq_flags(virq, IRQF_VALID);

#else

	irq_set_noprobe(virq);

#endif

	return 0;

}

drivers/mfd/ab8500-core.c

+0 −4
Original line number Diff line number Diff line
@@ -565,11 +565,7 @@ static int ab8500_irq_map(struct irq_domain *d, unsigned int virq, 
	irq_set_chip_and_handler(virq, &ab8500_irq_chip,

				handle_simple_irq);

	irq_set_nested_thread(virq, 1);

#ifdef CONFIG_ARM

	set_irq_flags(virq, IRQF_VALID);

#else

	irq_set_noprobe(virq);

#endif



	return 0;

}

drivers/mfd/arizona-irq.c

+0 −7
Original line number Diff line number Diff line
@@ -174,14 +174,7 @@ static int arizona_irq_map(struct irq_domain *h, unsigned int virq, 
	irq_set_chip_data(virq, data);

	irq_set_chip_and_handler(virq, &arizona_irq_chip, handle_simple_irq);

	irq_set_nested_thread(virq, 1);



	/* ARM needs us to explicitly flag the IRQ as valid

	 * and will set them noprobe when we do so. */

#ifdef CONFIG_ARM

	set_irq_flags(virq, IRQF_VALID);

#else

	irq_set_noprobe(virq);

#endif



	return 0;

}

drivers/mfd/asic3.c

+2 −2
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static int __init asic3_irq_probe(struct platform_device *pdev) 


		irq_set_chip_data(irq, asic);

		irq_set_handler(irq, handle_level_irq);

		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);

		irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE);

	}



	asic3_write_register(asic, ASIC3_OFFSET(INTR, INT_MASK),
@@ -431,7 +431,7 @@ static void asic3_irq_remove(struct platform_device *pdev) 
	irq_base = asic->irq_base;



	for (irq = irq_base; irq < irq_base + ASIC3_NR_IRQS; irq++) {

		set_irq_flags(irq, 0);

		irq_set_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE);

		irq_set_chip_and_handler(irq, NULL, NULL);

		irq_set_chip_data(irq, NULL);

	}

drivers/mfd/db8500-prcmu.c

+0 −1
Original line number Diff line number Diff line
@@ -2654,7 +2654,6 @@ static int db8500_irq_map(struct irq_domain *d, unsigned int virq, 
{

	irq_set_chip_and_handler(virq, &prcmu_irq_chip,

				handle_simple_irq);

	set_irq_flags(virq, IRQF_VALID);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE