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

[karo-tx-linux.git] / arch / mips / pci / pci-ar724x.c

diff --git a/arch/mips/pci/pci-ar724x.c b/arch/mips/pci/pci-ar724x.c
index 0af362b5af9266537b51a13ed9d2f842ad890992..907d11dd921b3da9b2f540b4ae14eab897a70588 100644 (file)
--- a/arch/mips/pci/pci-ar724x.c
+++ b/arch/mips/pci/pci-ar724x.c
@@ -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)