| Message ID | 20150713135739.160637975@linutronix.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Index: tip/arch/powerpc/platforms/52xx/mpc52xx_gpt.c =================================================================== --- tip.orig/arch/powerpc/platforms/52xx/mpc52xx_gpt.c +++ tip/arch/powerpc/platforms/52xx/mpc52xx_gpt.c @@ -258,8 +258,8 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt return; } - irq_set_handler_data(cascade_virq, gpt); - irq_set_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade); + irq_set_chained_handler_and_data(cascade_virq, + mpc52xx_gpt_irq_cascade, gpt); /* If the GPT is currently disabled, then change it to be in Input * Capture mode. If the mode is non-zero, then the pin could be
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/mpc52xx_gpt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)