Merge tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub...

[cascardo/linux.git] / kernel / irq / irqdomain.c

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 2d7cd34..cf68bb3 100644 (file)
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -465,39 +465,26 @@ int irq_create_strict_mappings(struct irq_domain *domain, unsigned int irq_base,
 }
 EXPORT_SYMBOL_GPL(irq_create_strict_mappings);
 
-unsigned int irq_create_of_mapping(struct device_node *controller,
-                                  const u32 *intspec, unsigned int intsize)
+unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data)
 {
        struct irq_domain *domain;
        irq_hw_number_t hwirq;
        unsigned int type = IRQ_TYPE_NONE;
        unsigned int virq;
 
-       domain = controller ? irq_find_host(controller) : irq_default_domain;
+       domain = irq_data->np ? irq_find_host(irq_data->np) : irq_default_domain;
        if (!domain) {
-#ifdef CONFIG_MIPS
-               /*
-                * Workaround to avoid breaking interrupt controller drivers
-                * that don't yet register an irq_domain.  This is temporary
-                * code. ~~~gcl, Feb 24, 2012
-                *
-                * Scheduled for removal in Linux v3.6.  That should be enough
-                * time.
-                */
-               if (intsize > 0)
-                       return intspec[0];
-#endif
                pr_warn("no irq domain found for %s !\n",
-                       of_node_full_name(controller));
+                       of_node_full_name(irq_data->np));
                return 0;
        }
 
        /* If domain has no translation, then we assume interrupt line */
        if (domain->ops->xlate == NULL)
-               hwirq = intspec[0];
+               hwirq = irq_data->args[0];
        else {
-               if (domain->ops->xlate(domain, controller, intspec, intsize,
-                                    &hwirq, &type))
+               if (domain->ops->xlate(domain, irq_data->np, irq_data->args,
+                                       irq_data->args_count, &hwirq, &type))
                        return 0;
        }