genirq: Remove irq argument from irq flow handlers

[linux-drm-fsl-dcu.git] / arch / mips / pci / pci-rt3883.c

diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
index 80fafe646e7411a9c8e8f8fa1e0cb75cbd7ea7b8..ed6732f9aa874c2557a93de78e9cb1c816320af1 100644 (file)
--- a/arch/mips/pci/pci-rt3883.c
+++ b/arch/mips/pci/pci-rt3883.c
@@ -129,7 +129,7 @@ static void rt3883_pci_write_cfg32(struct rt3883_pci_controller *rpc,
        rt3883_pci_w32(rpc, val, RT3883_PCI_REG_CFGDATA);
 }
 
-static void rt3883_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void rt3883_pci_irq_handler(struct irq_desc *desc)
 {
        struct rt3883_pci_controller *rpc;
        u32 pending;
@@ -145,7 +145,7 @@ static void rt3883_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
        }
 
        while (pending) {
-               unsigned bit = __ffs(pending);
+               unsigned irq, bit = __ffs(pending);
 
                irq = irq_find_mapping(rpc->irq_domain, bit);
                generic_handle_irq(irq);
@@ -225,8 +225,7 @@ static int rt3883_pci_irq_init(struct device *dev,
                return -ENODEV;
        }
 
-       irq_set_handler_data(irq, rpc);
-       irq_set_chained_handler(irq, rt3883_pci_irq_handler);
+       irq_set_chained_handler_and_data(irq, rt3883_pci_irq_handler, rpc);
 
        return 0;
 }