Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5921697 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[POWERPC] Compare irq numbers with NO_IRQ not IRQ_NONE 



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: default avatarMichael Ellerman <michael@ellerman.id.au>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a4c28ab7

arch/powerpc/kernel/irq.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */