irqchip/imgpdc: 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>
This commit is contained in:
parent
4d83fcf8d6
commit
bc4d2c074a
|
@ -451,13 +451,13 @@ static int pdc_intc_probe(struct platform_device *pdev)
|
|||
/* Setup chained handlers for the peripheral IRQs */
|
||||
for (i = 0; i < priv->nr_perips; ++i) {
|
||||
irq = priv->perip_irqs[i];
|
||||
irq_set_handler_data(irq, priv);
|
||||
irq_set_chained_handler(irq, pdc_intc_perip_isr);
|
||||
irq_set_chained_handler_and_data(irq, pdc_intc_perip_isr,
|
||||
priv);
|
||||
}
|
||||
|
||||
/* Setup chained handler for the syswake IRQ */
|
||||
irq_set_handler_data(priv->syswake_irq, priv);
|
||||
irq_set_chained_handler(priv->syswake_irq, pdc_intc_syswake_isr);
|
||||
irq_set_chained_handler_and_data(priv->syswake_irq,
|
||||
pdc_intc_syswake_isr, priv);
|
||||
|
||||
dev_info(&pdev->dev,
|
||||
"PDC IRQ controller initialised (%u perip IRQs, %u syswake IRQs)\n",
|
||||
|
|
Loading…
Reference in New Issue