1 files changed, 13 insertions, 14 deletions

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 4fa916dffc91..706e3ff67f8b 100644
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -473,6 +473,7 @@ EXPORT_SYMBOL_GPL(of_irq_to_resource_table);
 
 struct of_intc_desc {
         struct list_head        list;
+        of_irq_init_cb_t        irq_init_cb;
         struct device_node      *dev;
         struct device_node      *interrupt_parent;
 };
@@ -486,6 +487,7 @@ struct of_intc_desc {
  */
 void __init of_irq_init(const struct of_device_id *matches)
 {
+        const struct of_device_id *match;
         struct device_node *np, *parent = NULL;
         struct of_intc_desc *desc, *temp_desc;
         struct list_head intc_desc_list, intc_parent_list;
@@ -493,10 +495,15 @@ void __init of_irq_init(const struct of_device_id *matches)
         INIT_LIST_HEAD(&intc_desc_list);
         INIT_LIST_HEAD(&intc_parent_list);
 
-        for_each_matching_node(np, matches) {
+        for_each_matching_node_and_match(np, matches, &match) {
                 if (!of_find_property(np, "interrupt-controller", NULL) ||
                                 !of_device_is_available(np))
                         continue;
+
+                if (WARN(!match->data, "of_irq_init: no init function for %s\n",
+                         match->compatible))
+                        continue;
+
                 /*
                  * Here, we allocate and populate an of_intc_desc with the node
                  * pointer, interrupt-parent device_node etc.
@@ -507,6 +514,7 @@ void __init of_irq_init(const struct of_device_id *matches)
                         goto err;
                 }
 
+                desc->irq_init_cb = match->data;
                 desc->dev = of_node_get(np);
                 desc->interrupt_parent = of_irq_find_parent(np);
                 if (desc->interrupt_parent == np)
@@ -526,27 +534,18 @@ void __init of_irq_init(const struct of_device_id *matches)
                  * The assumption is that NULL parent means a root controller.
                  */
                 list_for_each_entry_safe(desc, temp_desc, &intc_desc_list, list) {
-                        const struct of_device_id *match;
                         int ret;
-                        of_irq_init_cb_t irq_init_cb;
 
                         if (desc->interrupt_parent != parent)
                                 continue;
 
                         list_del(&desc->list);
-                        match = of_match_node(matches, desc->dev);
-                        if (WARN(!match->data,
-                            "of_irq_init: no init function for %s\n",
-                            match->compatible)) {
-                                kfree(desc);
-                                continue;
-                        }
 
-                        pr_debug("of_irq_init: init %s @ %p, parent %p\n",
-                                 match->compatible,
+                        pr_debug("of_irq_init: init %s (%p), parent %p\n",
+                                 desc->dev->full_name,
                                  desc->dev, desc->interrupt_parent);
-                        irq_init_cb = (of_irq_init_cb_t)match->data;
-                        ret = irq_init_cb(desc->dev, desc->interrupt_parent);
+                        ret = desc->irq_init_cb(desc->dev,
+                                                desc->interrupt_parent);
                         if (ret) {
                                 kfree(desc);
                                 continue;