irqdomain: Remove temporary MIPS workaround code
authorGrant Likely <grant.likely@linaro.org>
Thu, 13 Jun 2013 22:19:43 +0000 (22:19 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 17 Jun 2013 22:31:34 +0000 (00:31 +0200)
The MIPS interrupt controllers are all registering their own irq_domains
now. Drop the MIPS specific code because it is no longer needed.

Signed-off-by: Grant Likely <grant.likely@linaro.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/5458/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
kernel/irq/irqdomain.c

index 54a4d5223238e15843559d16386bc4cdc1e63f25..a341b3d433ad7eb8216b3630bbfa6aa8b9da4d5a 100644 (file)
@@ -665,18 +665,6 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
 
        domain = controller ? irq_find_host(controller) : 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_warning("no irq domain found for %s !\n",
                           of_node_full_name(controller));
                return 0;