Merge tag 'ntb-4.2' of git://github.com/jonmason/ntb

[karo-tx-linux.git] / drivers / of / irq.c

diff --git a/drivers/of/irq.c b/drivers/of/irq.c
index 1a7980692f254c6917371dec5a11f77f448723cf..3cf7a01f557f4fbe924479e379d599d03016f07f 100644 (file)
--- a/drivers/of/irq.c
+++ b/drivers/of/irq.c
@@ -252,8 +252,6 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
                 * Successfully parsed an interrrupt-map translation; copy new
                 * interrupt specifier into the out_irq structure
                 */
-               out_irq->np = newpar;
-
                match_array = imap - newaddrsize - newintsize;
                for (i = 0; i < newintsize; i++)
                        out_irq->args[i] = be32_to_cpup(imap - newintsize + i);
@@ -262,6 +260,7 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
 
        skiplevel:
                /* Iterate again with new parent */
+               out_irq->np = newpar;
                pr_debug(" -> new parent: %s\n", of_node_full_name(newpar));
                of_node_put(ipar);
                ipar = newpar;
@@ -469,7 +468,7 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res,
 }
 EXPORT_SYMBOL_GPL(of_irq_to_resource_table);
 
-struct intc_desc {
+struct of_intc_desc {
        struct list_head        list;
        struct device_node      *dev;
        struct device_node      *interrupt_parent;
@@ -485,7 +484,7 @@ struct intc_desc {
 void __init of_irq_init(const struct of_device_id *matches)
 {
        struct device_node *np, *parent = NULL;
-       struct intc_desc *desc, *temp_desc;
+       struct of_intc_desc *desc, *temp_desc;
        struct list_head intc_desc_list, intc_parent_list;
 
        INIT_LIST_HEAD(&intc_desc_list);
@@ -496,7 +495,7 @@ void __init of_irq_init(const struct of_device_id *matches)
                                !of_device_is_available(np))
                        continue;
                /*
-                * Here, we allocate and populate an intc_desc with the node
+                * Here, we allocate and populate an of_intc_desc with the node
                 * pointer, interrupt-parent device_node etc.
                 */
                desc = kzalloc(sizeof(*desc), GFP_KERNEL);