PCI/MSI: Drop domain field from msi_controller

The only three users of that field are not using the msi_controller
structure anymore, so drop it altogether.

Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Yijing Wang <wangyijing@huawei.com>
Cc: Ma Jun <majun258@huawei.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Duc Dang <dhdang@apm.com>
Cc: Hanjun Guo <hanjun.guo@linaro.org>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-20-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 4603344097944ead0f82528918d390c00d65e8da..f70aa0f5cbaf23d5fb737dfc3e2a0d1e20be0ec4 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -45,9 +45,6 @@ static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev)
        if (domain)
                return domain;
 
-       if (dev->bus->msi && (domain = dev->bus->msi->domain))
-               return domain;
-
        return arch_get_pci_msi_domain(dev);
 }
 

diff --git a/include/linux/msi.h b/include/linux/msi.h
index 809b749f9300c7198a1a95482f9f432795294c32..ad939d0ba816372b975d5c44d9582617b7b618e0 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -160,9 +160,6 @@ struct msi_controller {
        struct device *dev;
        struct device_node *of_node;
        struct list_head list;
-#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
-       struct irq_domain *domain;
-#endif
 
        int (*setup_irq)(struct msi_controller *chip, struct pci_dev *dev,
                         struct msi_desc *desc);