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

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

diff --git a/drivers/pci/controller/pci-xgene-msi.c b/drivers/pci/controller/pci-xgene-msi.c
index 1c34c89..b7a8e06 100644 (file)
--- a/drivers/pci/controller/pci-xgene-msi.c
+++ b/drivers/pci/controller/pci-xgene-msi.c
@@ -291,8 +291,7 @@ static void xgene_msi_isr(struct irq_desc *desc)
        struct irq_chip *chip = irq_desc_get_chip(desc);
        struct xgene_msi_group *msi_groups;
        struct xgene_msi *xgene_msi;
-       unsigned int virq;
-       int msir_index, msir_val, hw_irq;
+       int msir_index, msir_val, hw_irq, ret;
        u32 intr_index, grp_select, msi_grp;
 
        chained_irq_enter(chip, desc);
@@ -330,10 +329,8 @@ static void xgene_msi_isr(struct irq_desc *desc)
                         * CPU0
                         */
                        hw_irq = hwirq_to_canonical_hwirq(hw_irq);
-                       virq = irq_find_mapping(xgene_msi->inner_domain, hw_irq);
-                       WARN_ON(!virq);
-                       if (virq != 0)
-                               generic_handle_irq(virq);
+                       ret = generic_handle_domain_irq(xgene_msi->inner_domain, hw_irq);
+                       WARN_ON_ONCE(ret);
                        msir_val &= ~(1 << intr_index);
                }
                grp_select &= ~(1 << msir_index);
@@ -451,7 +448,6 @@ static int xgene_msi_probe(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        xgene_msi->msi_regs = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(xgene_msi->msi_regs)) {
-               dev_err(&pdev->dev, "no reg space\n");
                rc = PTR_ERR(xgene_msi->msi_regs);
                goto error;
        }