[PATCH] irqdomain: Remove temporary MIPS workaround code

[PATCH] irqdomain: Remove temporary MIPS workaround code

[Grant Likely]

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

Re: [PATCH] irqdomain: Remove temporary MIPS workaround code

[Ralf Baechle]

On Fri, Jun 14, 2013 at 12:19:43AM +0100, Grant Likely wrote:

> 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.

I would like to merge this through the MIPS tree so it'll receive
maximum testing, just in case, ok?

  Ralf

Re: [PATCH] irqdomain: Remove temporary MIPS workaround code

[Grant Likely]

On Fri, Jun 14, 2013 at 9:22 AM, Ralf Baechle <ralf@linux-mips.org> wrote:
> On Fri, Jun 14, 2013 at 12:19:43AM +0100, Grant Likely wrote:
>
>> 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.
>
> I would like to merge this through the MIPS tree so it'll receive
> maximum testing, just in case, ok?

okay. I'll keep it out of my -next branch.

g.