diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2015-07-28 14:46:26 +0100 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-11-07 21:56:04 +0800 |
| commit | 516e6d13df6eff703621db0c61bc89e410b44ed7 (patch) | |
| tree | e714fc983e7fde293d20de25bba32840fe142ce2 | |
| parent | 3fc8e2fbf657e6bc2ce2638ef47dd94b1f774f68 (diff) | |
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>
(cherry picked from commit f075915ac0b11847fcfc8c4d55526a317e71c4d1)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
| -rw-r--r-- | drivers/pci/msi.c | 3 | ||||
| -rw-r--r-- | include/linux/msi.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 3ee8c99ece0b..1c7f6a8e69d1 100644 --- 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 5d71dc25d26a..5b612c460b51 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -117,9 +117,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); |