aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2014-12-08 18:54:14 +0000
committerJon Medhurst <tixy@linaro.org>2015-07-22 15:33:57 +0100
commite3d522ab94bea7063b324c7279c7b0cc46ebe9ef (patch)
tree9df9b168e64a7132482fd5eca0dac7f44d2d7737
parentec2ea87d1a179be8a8cc4b95f82423b6bd86c091 (diff)
PCI/MSI: Let pci_msi_get_domain use struct device's msi_domain
Now that we can easily find which MSI domain a PCI device is using, use dev_get_msi_domain as a way to retrieve the information. The original code is still used as a fallback. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--drivers/pci/msi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index f66be868ad21..f27402170b9f 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -41,7 +41,8 @@ static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev)
{
struct irq_domain *domain = NULL;
- if (dev->bus->msi)
+ domain = dev_get_msi_domain(&dev->dev);
+ if (!domain && dev->bus->msi)
domain = dev->bus->msi->domain;
if (!domain)
domain = arch_get_pci_msi_domain(dev);