Message ID | 20150713135739.083856550@linutronix.de (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Index: tip/arch/powerpc/platforms/52xx/media5200.c =================================================================== --- tip.orig/arch/powerpc/platforms/52xx/media5200.c +++ tip/arch/powerpc/platforms/52xx/media5200.c @@ -179,8 +179,8 @@ static void __init media5200_init_irq(vo goto out; pr_debug("%s: allocated irqhost\n", __func__); - irq_set_handler_data(cascade_virq, &media5200_irq); - irq_set_chained_handler(cascade_virq, media5200_irq_cascade); + irq_set_chained_handler_and_data(cascade_virq, media5200_irq_cascade, + &media5200_irq); return;
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/52xx/media5200.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)