Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/drivers/pci/controller/dwc/pcie-uniphier.c b/drivers/pci/controller/dwc/pcie-uniphier.c
index 7e8bad3..d842fd0 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-uniphier.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier.c
@@ -235,7 +235,7 @@ static void uniphier_pcie_irq_handler(struct irq_desc *desc)
        struct uniphier_pcie_priv *priv = to_uniphier_pcie(pci);
        struct irq_chip *chip = irq_desc_get_chip(desc);
        unsigned long reg;
-       u32 val, bit, virq;
+       u32 val, bit;
 
        /* INT for debug */
        val = readl(priv->base + PCL_RCV_INT);
@@ -257,10 +257,8 @@ static void uniphier_pcie_irq_handler(struct irq_desc *desc)
        val = readl(priv->base + PCL_RCV_INTX);
        reg = FIELD_GET(PCL_RCV_INTX_ALL_STATUS, val);
 
-       for_each_set_bit(bit, &reg, PCI_NUM_INTX) {
-               virq = irq_linear_revmap(priv->legacy_irq_domain, bit);
-               generic_handle_irq(virq);
-       }
+       for_each_set_bit(bit, &reg, PCI_NUM_INTX)
+               generic_handle_domain_irq(priv->legacy_irq_domain, bit);
 
        chained_irq_exit(chip, desc);
 }