MIPS: pci-ar724x: Consolidate chained IRQ handler install/remove
authorThomas Gleixner <tglx@linutronix.de>
Mon, 13 Jul 2015 20:45:56 +0000 (20:45 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 26 Aug 2015 13:23:24 +0000 (15:23 +0200)
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: linux-mips@linux-mips.org
Cc: LKML <linux-kernel@vger.kernel.org>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Patchwork: https://patchwork.linux-mips.org/patch/10697/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/pci/pci-ar724x.c

index 0af362b5af9266537b51a13ed9d2f842ad890992..907d11dd921b3da9b2f540b4ae14eab897a70588 100644 (file)
@@ -321,8 +321,8 @@ static void ar724x_pci_irq_init(struct ar724x_pci_controller *apc,
                irq_set_chip_data(i, apc);
        }
 
-       irq_set_handler_data(apc->irq, apc);
-       irq_set_chained_handler(apc->irq, ar724x_pci_irq_handler);
+       irq_set_chained_handler_and_data(apc->irq, ar724x_pci_irq_handler,
+                                        apc);
 }
 
 static int ar724x_pci_probe(struct platform_device *pdev)