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+ker...@arm.linux.org.uk> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Cc: Julia Lawall <julia.law...@lip6.fr> Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org> Cc: Michael Ellerman <m...@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/platforms/cell/interrupt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: tip/arch/powerpc/platforms/cell/interrupt.c =================================================================== --- tip.orig/arch/powerpc/platforms/cell/interrupt.c +++ tip/arch/powerpc/platforms/cell/interrupt.c @@ -357,8 +357,8 @@ static int __init setup_iic(void) * irq_data is a generic pointer that gets passed back * to us later, so the forced cast is fine. */ - irq_set_handler_data(cascade, (void __force *)node_iic); - irq_set_chained_handler(cascade, iic_ioexc_cascade); + irq_set_chained_handler_and_data(cascade, iic_ioexc_cascade, + (void __force *)node_iic); out_be64(&node_iic->iic_ir, (1 << 12) /* priority */ | (node << 4) /* dest node */ | _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev