diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2015-07-28 14:46:14 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-30 00:14:37 +0200 |
| commit | d8a1cb7575502d2be502a65ecb344ff05c8d9f44 (patch) | |
| tree | 64c24ea4b77aaf54e3234ae812ea4c0b9843fdb6 /drivers | |
| parent | 471c931cb248ab7af0cd62503d811239b47f217b (diff) | |
| download | linux-stable-d8a1cb7575502d2be502a65ecb344ff05c8d9f44.tar.gz linux-stable-d8a1cb7575502d2be502a65ecb344ff05c8d9f44.tar.bz2 linux-stable-d8a1cb7575502d2be502a65ecb344ff05c8d9f44.zip | |
PCI/MSI: Let pci_msi_get_domain use struct device::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.
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
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: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1438091186-10244-8-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/msi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 3aae7c9ad31c..460334409794 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -39,14 +39,16 @@ struct irq_domain * __weak arch_get_pci_msi_domain(struct pci_dev *dev) static struct irq_domain *pci_msi_get_domain(struct pci_dev *dev) { - struct irq_domain *domain = NULL; + struct irq_domain *domain; - if (dev->bus->msi) - domain = dev->bus->msi->domain; - if (!domain) - domain = arch_get_pci_msi_domain(dev); + domain = dev_get_msi_domain(&dev->dev); + if (domain) + return domain; - return domain; + if (dev->bus->msi && (domain = dev->bus->msi->domain)) + return domain; + + return arch_get_pci_msi_domain(dev); } static int pci_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) |