linux-mips
[Top] [All Lists]

[PATCH] irqdomain: Remove temporary MIPS workaround code

To: linux-kernel@vger.kernel.org
Subject: [PATCH] irqdomain: Remove temporary MIPS workaround code
From: Grant Likely <grant.likely@linaro.org>
Date: Fri, 14 Jun 2013 00:19:43 +0100
Cc: Grant Likely <grant.likely@linaro.org>, Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
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: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---

Ralf, this should be okay to pull out now. I'll be submitting it for
v3.11 unless someone yells. Even if so, all the irqdomain infrastructure
is in place to make it trivial to add an irqdomain where missing.

g.

 kernel/irq/irqdomain.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 13f2654..e0c3366 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -475,18 +475,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_warn("no irq domain found for %s !\n",
                        of_node_full_name(controller));
                return 0;
-- 
1.8.1.2


<Prev in Thread] Current Thread [Next in Thread>