of/irq: 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>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 62cfdc2c86ac500d869ba319c1a87899cbefc98f..89ebc612293d398da3c97886ea3502aa54c0a6ab 100644 (file)
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -579,26 +579,6 @@ err:
        }
 }
 
-/**
- * of_msi_configure - Set the msi_domain field of a device
- * @dev: device structure to associate with an MSI irq domain
- * @np: device node for that device
- */
-void of_msi_configure(struct device *dev, struct device_node *np)
-{
-       struct device_node *msi_np;
-       struct irq_domain *d;
-
-       msi_np = of_parse_phandle(np, "msi-parent", 0);
-       if (!msi_np)
-               return;
-
-       d = irq_find_matching_host(msi_np, DOMAIN_BUS_PLATFORM_MSI);
-       if (!d)
-               d = irq_find_host(msi_np);
-       dev_set_msi_domain(dev, d);
-}
-
 /**
  * of_msi_map_rid - Map a MSI requester ID for a device.
  * @dev: device for which the mapping is to be done.
@@ -741,3 +721,14 @@ struct irq_domain *of_msi_get_domain(struct device *dev,
 
        return NULL;
 }
+
+/**
+ * of_msi_configure - Set the msi_domain field of a device
+ * @dev: device structure to associate with an MSI irq domain
+ * @np: device node for that device
+ */
+void of_msi_configure(struct device *dev, struct device_node *np)
+{
+       dev_set_msi_domain(dev,
+                          of_msi_get_domain(dev, np, DOMAIN_BUS_PLATFORM_MSI));
+}