[PATCH 1/1] Use NO_IRQ not IRQ_NONE

[PATCH 1/1] Use NO_IRQ not IRQ_NONE

[Michael Ellerman]

There is a thinko in the irq code, it uses IRQ_NONE to indicate no irq,
whereas it should be using NO_IRQ. IRQ_NONE is returned from irq handlers
to say "not handled".

As it happens they currently have the same value (0), so this is just for
future proof-ness.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
---
 arch/powerpc/kernel/irq.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 068377a..42c8ed6 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -489,7 +489,7 @@ struct irq_host *irq_alloc_host(unsigned int revmap_type,
 	case IRQ_HOST_MAP_LINEAR:
 		rmap = (unsigned int *)(host + 1);
 		for (i = 0; i < revmap_arg; i++)
-			rmap[i] = IRQ_NONE;
+			rmap[i] = NO_IRQ;
 		host->revmap_data.linear.size = revmap_arg;
 		smp_wmb();
 		host->revmap_data.linear.revmap = rmap;
@@ -614,7 +614,7 @@ unsigned int irq_create_mapping(struct irq_host *host,
 	 * host->ops->map() to update the flags
 	 */
 	virq = irq_find_mapping(host, hwirq);
-	if (virq != IRQ_NONE) {
+	if (virq != NO_IRQ) {
 		if (host->ops->remap)
 			host->ops->remap(host, virq, hwirq);
 		pr_debug("irq: -> existing mapping on virq %d\n", virq);
@@ -741,7 +741,7 @@ void irq_dispose_mapping(unsigned int virq)
 	switch(host->revmap_type) {
 	case IRQ_HOST_MAP_LINEAR:
 		if (hwirq < host->revmap_data.linear.size)
-			host->revmap_data.linear.revmap[hwirq] = IRQ_NONE;
+			host->revmap_data.linear.revmap[hwirq] = NO_IRQ;
 		break;
 	case IRQ_HOST_MAP_TREE:
 		/* Check if radix tree allocated yet */
-- 
1.5.1.3.g7a33b

Re: [PATCH 1/1] Use NO_IRQ not IRQ_NONE

[Benjamin Herrenschmidt]

On Fri, 2007-06-01 at 17:23 +1000, Michael Ellerman wrote:
> There is a thinko in the irq code, it uses IRQ_NONE to indicate no irq,
> whereas it should be using NO_IRQ. IRQ_NONE is returned from irq handlers
> to say "not handled".
> 
> As it happens they currently have the same value (0), so this is just for
> future proof-ness.
> 
> Signed-off-by: Michael Ellerman <michael@ellerman.id.au>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

My fault actually :-) Mostly a typo, it's right elsewhere in the code
except in those 3 occurences. Brown paper bag time for me.

Cheers,
Ben.

Re: [PATCH 1/1] Use NO_IRQ not IRQ_NONE

[Linas Vepstas]

On Fri, Jun 01, 2007 at 05:47:32PM +1000, Benjamin Herrenschmidt wrote:
> My fault actually :-) Mostly a typo, it's right elsewhere in the code
> except in those 3 occurences. Brown paper bag time for me.

Trying to make the rest of us look bad?  By those standards, 
I'd be wearing 23 brown paper bags at the same time, all the time.

--linas