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

[linux-2.6-microblaze.git] / drivers / pci / controller / pcie-rockchip-host.c

diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
index 78d04ac..c52316d 100644 (file)
--- a/drivers/pci/controller/pcie-rockchip-host.c
+++ b/drivers/pci/controller/pcie-rockchip-host.c
@@ -517,7 +517,7 @@ static void rockchip_pcie_legacy_int_handler(struct irq_desc *desc)
        struct device *dev = rockchip->dev;
        u32 reg;
        u32 hwirq;
-       u32 virq;
+       int ret;
 
        chained_irq_enter(chip, desc);
 
@@ -528,10 +528,8 @@ static void rockchip_pcie_legacy_int_handler(struct irq_desc *desc)
                hwirq = ffs(reg) - 1;
                reg &= ~BIT(hwirq);
 
-               virq = irq_find_mapping(rockchip->irq_domain, hwirq);
-               if (virq)
-                       generic_handle_irq(virq);
-               else
+               ret = generic_handle_domain_irq(rockchip->irq_domain, hwirq);
+               if (ret)
                        dev_err(dev, "unexpected IRQ, INT%d\n", hwirq);
        }