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

[linux-2.6-microblaze.git] / drivers / pci / controller / pcie-altera-msi.c

diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c
index 98aa1dc..7b1d3eb 100644 (file)
--- a/drivers/pci/controller/pcie-altera-msi.c
+++ b/drivers/pci/controller/pcie-altera-msi.c
@@ -55,7 +55,7 @@ static void altera_msi_isr(struct irq_desc *desc)
        struct altera_msi *msi;
        unsigned long status;
        u32 bit;
-       u32 virq;
+       int ret;
 
        chained_irq_enter(chip, desc);
        msi = irq_desc_get_handler_data(desc);
@@ -65,11 +65,9 @@ static void altera_msi_isr(struct irq_desc *desc)
                        /* Dummy read from vector to clear the interrupt */
                        readl_relaxed(msi->vector_base + (bit * sizeof(u32)));
 
-                       virq = irq_find_mapping(msi->inner_domain, bit);
-                       if (virq)
-                               generic_handle_irq(virq);
-                       else
-                               dev_err(&msi->pdev->dev, "unexpected MSI\n");
+                       ret = generic_handle_domain_irq(msi->inner_domain, bit);
+                       if (ret)
+                               dev_err_ratelimited(&msi->pdev->dev, "unexpected MSI\n");
                }
        }