Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / pci / controller / dwc / pci-keystone.c

diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index bde3b28..865258d 100644 (file)
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -259,14 +259,12 @@ static void ks_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie,
        struct dw_pcie *pci = ks_pcie->pci;
        struct device *dev = pci->dev;
        u32 pending;
-       int virq;
 
        pending = ks_pcie_app_readl(ks_pcie, IRQ_STATUS(offset));
 
        if (BIT(0) & pending) {
-               virq = irq_linear_revmap(ks_pcie->legacy_irq_domain, offset);
-               dev_dbg(dev, ": irq: irq_offset %d, virq %d\n", offset, virq);
-               generic_handle_irq(virq);
+               dev_dbg(dev, ": irq: irq_offset %d", offset);
+               generic_handle_domain_irq(ks_pcie->legacy_irq_domain, offset);
        }
 
        /* EOI the INTx interrupt */
@@ -579,7 +577,7 @@ static void ks_pcie_msi_irq_handler(struct irq_desc *desc)
        struct pcie_port *pp = &pci->pp;
        struct device *dev = pci->dev;
        struct irq_chip *chip = irq_desc_get_chip(desc);
-       u32 vector, virq, reg, pos;
+       u32 vector, reg, pos;
 
        dev_dbg(dev, "%s, irq %d\n", __func__, irq);
 
@@ -600,10 +598,8 @@ static void ks_pcie_msi_irq_handler(struct irq_desc *desc)
                        continue;
 
                vector = offset + (pos << 3);
-               virq = irq_linear_revmap(pp->irq_domain, vector);
-               dev_dbg(dev, "irq: bit %d, vector %d, virq %d\n", pos, vector,
-                       virq);
-               generic_handle_irq(virq);
+               dev_dbg(dev, "irq: bit %d, vector %d\n", pos, vector);
+               generic_handle_domain_irq(pp->irq_domain, vector);
        }
 
        chained_irq_exit(chip, desc);