irqchip/exynos-combiner: Consolidate chained IRQ handler install/remove
Chained irq handlers usually set up handler data as well. We now have a function to set both under irq_desc->lock. Replace the two calls with one. Search and conversion was done with coccinelle: @@ expression E1, E2, E3; @@ ( -if (irq_set_handler_data(E1, E2) != 0) - BUG(); | -irq_set_handler_data(E1, E2); ) -irq_set_chained_handler(E1, E3); +irq_set_chained_handler_and_data(E1, E3, E2); @@ expression E1, E2, E3; @@ ( -if (irq_set_handler_data(E1, E2) != 0) - BUG(); ... | -irq_set_handler_data(E1, E2); ... ) -irq_set_chained_handler(E1, E3); +irq_set_chained_handler_and_data(E1, E3, E2); Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Julia Lawall <Julia.Lawall@lip6.fr> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Kukjin Kim <kgene@kernel.org> Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org
This commit is contained in:
parent
a8a98eac7b
commit
741ff96613
1 changed files with 2 additions and 3 deletions
|
@ -121,9 +121,8 @@ static struct irq_chip combiner_chip = {
|
||||||
static void __init combiner_cascade_irq(struct combiner_chip_data *combiner_data,
|
static void __init combiner_cascade_irq(struct combiner_chip_data *combiner_data,
|
||||||
unsigned int irq)
|
unsigned int irq)
|
||||||
{
|
{
|
||||||
if (irq_set_handler_data(irq, combiner_data) != 0)
|
irq_set_chained_handler_and_data(irq, combiner_handle_cascade_irq,
|
||||||
BUG();
|
combiner_data);
|
||||||
irq_set_chained_handler(irq, combiner_handle_cascade_irq);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init combiner_init_one(struct combiner_chip_data *combiner_data,
|
static void __init combiner_init_one(struct combiner_chip_data *combiner_data,
|
||||||
|
|
Loading…
Reference in a new issue