diff options
author | Grant Likely <grant.likely@linaro.org> | 2013-06-13 18:19:43 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-06-17 18:31:34 -0400 |
commit | c5cdc67a58a22c49f558b450c6f748251ceb2e7b (patch) | |
tree | 15b6f44d9065eaebbf71b415b6ec6daba4b91e68 /kernel/irq | |
parent | d3478d5b73efb713378bebb31ac9a11f5a6dc587 (diff) |
irqdomain: Remove temporary MIPS workaround code
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>
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/irqdomain.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 54a4d5223238..a341b3d433ad 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c | |||
@@ -665,18 +665,6 @@ unsigned int irq_create_of_mapping(struct device_node *controller, | |||
665 | 665 | ||
666 | domain = controller ? irq_find_host(controller) : irq_default_domain; | 666 | domain = controller ? irq_find_host(controller) : irq_default_domain; |
667 | if (!domain) { | 667 | if (!domain) { |
668 | #ifdef CONFIG_MIPS | ||
669 | /* | ||
670 | * Workaround to avoid breaking interrupt controller drivers | ||
671 | * that don't yet register an irq_domain. This is temporary | ||
672 | * code. ~~~gcl, Feb 24, 2012 | ||
673 | * | ||
674 | * Scheduled for removal in Linux v3.6. That should be enough | ||
675 | * time. | ||
676 | */ | ||
677 | if (intsize > 0) | ||
678 | return intspec[0]; | ||
679 | #endif | ||
680 | pr_warning("no irq domain found for %s !\n", | 668 | pr_warning("no irq domain found for %s !\n", |
681 | of_node_full_name(controller)); | 669 | of_node_full_name(controller)); |
682 | return 0; | 670 | return 0; |