1 files changed, 3 insertions, 15 deletions

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 4fa916dffc91..a9ea5525109b 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -680,18 +680,6 @@ u32 of_msi_map_rid(struct device *dev, struct device_node *msi_np, u32 rid_in)
         return __of_msi_map_rid(dev, &msi_np, rid_in);
 }
 
-static struct irq_domain *__of_get_msi_domain(struct device_node *np,
-                                              enum irq_domain_bus_token token)
-{
-        struct irq_domain *d;
-
-        d = irq_find_matching_host(np, token);
-        if (!d)
-                d = irq_find_host(np);
-
-        return d;
-}
-
 /**
  * of_msi_map_get_device_domain - Use msi-map to find the relevant MSI domain
  * @dev: device for which the mapping is to be done.
@@ -707,7 +695,7 @@ struct irq_domain *of_msi_map_get_device_domain(struct device *dev, u32 rid)
         struct device_node *np = NULL;
 
         __of_msi_map_rid(dev, &np, rid);
-        return __of_get_msi_domain(np, DOMAIN_BUS_PCI_MSI);
+        return irq_find_matching_host(np, DOMAIN_BUS_PCI_MSI);
 }
 
 /**
@@ -731,7 +719,7 @@ struct irq_domain *of_msi_get_domain(struct device *dev,
         /* Check for a single msi-parent property */
         msi_np = of_parse_phandle(np, "msi-parent", 0);
         if (msi_np && !of_property_read_bool(msi_np, "#msi-cells")) {
-                d = __of_get_msi_domain(msi_np, token);
+                d = irq_find_matching_host(msi_np, token);
                 if (!d)
                         of_node_put(msi_np);
                 return d;
@@ -745,7 +733,7 @@ struct irq_domain *of_msi_get_domain(struct device *dev,
                 while (!of_parse_phandle_with_args(np, "msi-parent",
                                                    "#msi-cells",
                                                    index, &args)) {
-                        d = __of_get_msi_domain(args.np, token);
+                        d = irq_find_matching_host(args.np, token);
                         if (d)
                                 return d;