Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / pci / host / pci-xgene-msi.c

diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c
index 398c9bf..996327c 100644 (file)
--- a/drivers/pci/host/pci-xgene-msi.c
+++ b/drivers/pci/host/pci-xgene-msi.c
@@ -40,8 +40,8 @@ struct xgene_msi_group {
 
 struct xgene_msi {
        struct device_node      *node;
-       struct msi_controller   mchip;
-       struct irq_domain       *domain;
+       struct irq_domain       *inner_domain;
+       struct irq_domain       *msi_domain;
        u64                     msi_addr;
        void __iomem            *msi_regs;
        unsigned long           *bitmap;
@@ -251,17 +251,17 @@ static const struct irq_domain_ops msi_domain_ops = {
 
 static int xgene_allocate_domains(struct xgene_msi *msi)
 {
-       msi->domain = irq_domain_add_linear(NULL, NR_MSI_VEC,
-                                           &msi_domain_ops, msi);
-       if (!msi->domain)
+       msi->inner_domain = irq_domain_add_linear(NULL, NR_MSI_VEC,
+                                                 &msi_domain_ops, msi);
+       if (!msi->inner_domain)
                return -ENOMEM;
 
-       msi->mchip.domain = pci_msi_create_irq_domain(msi->mchip.of_node,
-                                                     &xgene_msi_domain_info,
-                                                     msi->domain);
+       msi->msi_domain = pci_msi_create_irq_domain(msi->node,
+                                                   &xgene_msi_domain_info,
+                                                   msi->inner_domain);
 
-       if (!msi->mchip.domain) {
-               irq_domain_remove(msi->domain);
+       if (!msi->msi_domain) {
+               irq_domain_remove(msi->inner_domain);
                return -ENOMEM;
        }
 
@@ -270,10 +270,10 @@ static int xgene_allocate_domains(struct xgene_msi *msi)
 
 static void xgene_free_domains(struct xgene_msi *msi)
 {
-       if (msi->mchip.domain)
-               irq_domain_remove(msi->mchip.domain);
-       if (msi->domain)
-               irq_domain_remove(msi->domain);
+       if (msi->msi_domain)
+               irq_domain_remove(msi->msi_domain);
+       if (msi->inner_domain)
+               irq_domain_remove(msi->inner_domain);
 }
 
 static int xgene_msi_init_allocator(struct xgene_msi *xgene_msi)
@@ -339,7 +339,7 @@ static void xgene_msi_isr(unsigned int irq, struct irq_desc *desc)
                         * CPU0
                         */
                        hw_irq = hwirq_to_canonical_hwirq(hw_irq);
-                       virq = irq_find_mapping(xgene_msi->domain, hw_irq);
+                       virq = irq_find_mapping(xgene_msi->inner_domain, hw_irq);
                        WARN_ON(!virq);
                        if (virq != 0)
                                generic_handle_irq(virq);
@@ -367,10 +367,8 @@ static int xgene_msi_remove(struct platform_device *pdev)
 
        for (i = 0; i < NR_HW_IRQS; i++) {
                virq = msi->msi_groups[i].gic_irq;
-               if (virq != 0) {
-                       irq_set_chained_handler(virq, NULL);
-                       irq_set_handler_data(virq, NULL);
-               }
+               if (virq != 0)
+                       irq_set_chained_handler_and_data(virq, NULL, NULL);
        }
        kfree(msi->msi_groups);
 
@@ -420,8 +418,8 @@ static int xgene_msi_hwirq_alloc(unsigned int cpu)
                }
 
                if (err) {
-                       irq_set_chained_handler(msi_group->gic_irq, NULL);
-                       irq_set_handler_data(msi_group->gic_irq, NULL);
+                       irq_set_chained_handler_and_data(msi_group->gic_irq,
+                                                        NULL, NULL);
                        return err;
                }
        }
@@ -440,8 +438,8 @@ static void xgene_msi_hwirq_free(unsigned int cpu)
                if (!msi_group->gic_irq)
                        continue;
 
-               irq_set_chained_handler(msi_group->gic_irq, NULL);
-               irq_set_handler_data(msi_group->gic_irq, NULL);
+               irq_set_chained_handler_and_data(msi_group->gic_irq, NULL,
+                                                NULL);
        }
 }
 
@@ -496,7 +494,7 @@ static int xgene_msi_probe(struct platform_device *pdev)
                goto error;
        }
        xgene_msi->msi_addr = res->start;
-
+       xgene_msi->node = pdev->dev.of_node;
        xgene_msi->num_cpus = num_possible_cpus();
 
        rc = xgene_msi_init_allocator(xgene_msi);
@@ -560,19 +558,10 @@ static int xgene_msi_probe(struct platform_device *pdev)
 
        cpu_notifier_register_done();
 
-       xgene_msi->mchip.of_node = pdev->dev.of_node;
-       rc = of_pci_msi_chip_add(&xgene_msi->mchip);
-       if (rc) {
-               dev_err(&pdev->dev, "failed to add MSI controller chip\n");
-               goto error_notifier;
-       }
-
        dev_info(&pdev->dev, "APM X-Gene PCIe MSI driver loaded\n");
 
        return 0;
 
-error_notifier:
-       unregister_hotcpu_notifier(&xgene_msi_cpu_notifier);
 error:
        xgene_msi_remove(pdev);
        return rc;