PCI/keystone: 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 <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Murali Karicheri <m-karicheri2@ti.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Cc: Jiang Liu <jiang.liu@linux.intel.com>

diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index 734da589cdfb94b4312c3a8cd13dbe06c9c5604c..5998e93a03b10d2503dcb4e1b6bd425a9f48f45d 100644 (file)
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -212,9 +212,9 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)
 
        /* Legacy IRQ */
        for (i = 0; i < ks_pcie->num_legacy_host_irqs; i++) {
-               irq_set_handler_data(ks_pcie->legacy_host_irqs[i], ks_pcie);
-               irq_set_chained_handler(ks_pcie->legacy_host_irqs[i],
-                                       ks_pcie_legacy_irq_handler);
+               irq_set_chained_handler_and_data(ks_pcie->legacy_host_irqs[i],
+                                                ks_pcie_legacy_irq_handler,
+                                                ks_pcie);
        }
        ks_dw_pcie_enable_legacy_irqs(ks_pcie);