diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2015-09-18 14:07:40 +0100 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2015-10-16 13:07:14 +0100 |
commit | c8d175883e0db09ce94b8b47bb2432b787149a6b (patch) | |
tree | 263f0c9b5ff782336afc610b3f8d4a4d60a50c38 /drivers/pci/of.c | |
parent | 61c08240a103000b75dcf7ef2cf03d552aa91fa3 (diff) | |
download | linux-stable-c8d175883e0db09ce94b8b47bb2432b787149a6b.tar.gz linux-stable-c8d175883e0db09ce94b8b47bb2432b787149a6b.tar.bz2 linux-stable-c8d175883e0db09ce94b8b47bb2432b787149a6b.zip |
PCI/MSI: Use of_msi_get_domain instead of open-coded "msi-parent" parsing
Now that we have a function that implements the complexity of the
"msi-parent" property parsing, switch to that.
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'drivers/pci/of.c')
-rw-r--r-- | drivers/pci/of.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 2e99a500cb83..e112da11630e 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -13,6 +13,7 @@ #include <linux/kernel.h> #include <linux/pci.h> #include <linux/of.h> +#include <linux/of_irq.h> #include <linux/of_pci.h> #include "pci.h" @@ -64,27 +65,25 @@ struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus) struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus) { #ifdef CONFIG_IRQ_DOMAIN - struct device_node *np; struct irq_domain *d; if (!bus->dev.of_node) return NULL; /* Start looking for a phandle to an MSI controller. */ - np = of_parse_phandle(bus->dev.of_node, "msi-parent", 0); + d = of_msi_get_domain(&bus->dev, bus->dev.of_node, DOMAIN_BUS_PCI_MSI); + if (d) + return d; /* * If we don't have an msi-parent property, look for a domain * directly attached to the host bridge. */ - if (!np) - np = bus->dev.of_node; - - d = irq_find_matching_host(np, DOMAIN_BUS_PCI_MSI); + d = irq_find_matching_host(bus->dev.of_node, DOMAIN_BUS_PCI_MSI); if (d) return d; - return irq_find_host(np); + return irq_find_host(bus->dev.of_node); #else return NULL; #endif |