| Message ID | 20150713135739.327873721@linutronix.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Index: tip/arch/powerpc/platforms/cell/axon_msi.c =================================================================== --- tip.orig/arch/powerpc/platforms/cell/axon_msi.c +++ tip/arch/powerpc/platforms/cell/axon_msi.c @@ -390,8 +390,7 @@ static int axon_msi_probe(struct platfor goto out_free_fifo; } - irq_set_handler_data(virq, msic); - irq_set_chained_handler(virq, axon_msi_cascade); + irq_set_chained_handler_and_data(virq, axon_msi_cascade, msic); pr_devel("axon_msi: irq 0x%x setup for axon_msi\n", virq); /* Enable the MSIC hardware */
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. 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: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/platforms/cell/axon_msi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)