MIPS: pci-ar71xx: Consolidate chained IRQ handler install/remove

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 <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Julia Lawall <[email protected]>
Cc: [email protected]
Cc: LKML <[email protected]>
Cc: Jiang Liu <[email protected]>
Patchwork: https://patchwork.linux-mips.org/patch/10696/
Signed-off-by: Ralf Baechle <[email protected]>

diff --git a/arch/mips/pci/pci-ar71xx.c b/arch/mips/pci/pci-ar71xx.c
index 283157f8dc64794a3a02936ef11974538c8950eb..ad35a5e6a56c5b4ca978f702a8786b1dcd998fa3 100644 (file)
--- a/arch/mips/pci/pci-ar71xx.c
+++ b/arch/mips/pci/pci-ar71xx.c
@@ -312,8 +312,8 @@ static void ar71xx_pci_irq_init(struct ar71xx_pci_controller *apc)
                irq_set_chip_data(i, apc);
        }
 
-       irq_set_handler_data(apc->irq, apc);
-       irq_set_chained_handler(apc->irq, ar71xx_pci_irq_handler);
+       irq_set_chained_handler_and_data(apc->irq, ar71xx_pci_irq_handler,
+                                        apc);
 }
 
 static void ar71xx_pci_reset(void)