These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / mips / pci / pci-ar724x.c

diff --git a/kernel/arch/mips/pci/pci-ar724x.c b/kernel/arch/mips/pci/pci-ar724x.c
index a1b7d2a..2013dad 100644 (file)
--- a/kernel/arch/mips/pci/pci-ar724x.c
+++ b/kernel/arch/mips/pci/pci-ar724x.c
@@ -225,13 +225,13 @@ static struct pci_ops ar724x_pci_ops = {
        .write  = ar724x_pci_write,
 };
 
-static void ar724x_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
+static void ar724x_pci_irq_handler(struct irq_desc *desc)
 {
        struct ar724x_pci_controller *apc;
        void __iomem *base;
        u32 pending;
 
-       apc = irq_get_handler_data(irq);
+       apc = irq_desc_get_handler_data(desc);
        base = apc->ctrl_base;
 
        pending = __raw_readl(base + AR724X_PCI_REG_INT_STATUS) &
@@ -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)