[patch 08/20] powerpc/holly: Consolidate chained IRQ handler install/remove
From: Thomas Gleixner <hidden>
Date: 2015-07-13 20:50:21
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 <redacted> Signed-off-by: Thomas Gleixner <redacted> Cc: Julia Lawall <redacted> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/platforms/embedded6xx/holly.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: tip/arch/powerpc/platforms/embedded6xx/holly.c ===================================================================
--- tip.orig/arch/powerpc/platforms/embedded6xx/holly.c
+++ tip/arch/powerpc/platforms/embedded6xx/holly.c@@ -180,8 +180,8 @@ static void __init holly_init_IRQ(void) cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0); pr_debug("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__, (u32) cascade_pci_irq); tsi108_pci_int_init(cascade_node); - irq_set_handler_data(cascade_pci_irq, mpic); - irq_set_chained_handler(cascade_pci_irq, tsi108_irq_cascade); + irq_set_chained_handler_and_data(cascade_pci_irq, tsi108_irq_cascade, + mpic); #endif /* Configure MPIC outputs to CPU0 */ tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);