diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2006-10-23 23:37:34 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-10-25 00:20:20 -0400 |
commit | 5414c6be57dd02e089c3eba1f5134f441733d013 (patch) | |
tree | cba51e6f4cb80eade6ad107b757ce38d95c249a0 /arch/powerpc/kernel/irq.c | |
parent | a0f467261ae041864414103b8dd6fc4487a3c7de (diff) |
[POWERPC] Make irq_dispose_mapping(NO_IRQ) a nop
It makes for a friendlier API if irq_dispose_mapping(NO_IRQ) is a
nop, rather than triggering a WARN_ON.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r-- | arch/powerpc/kernel/irq.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 67b21a008f6e..eb9fc621e057 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -648,10 +648,14 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map); | |||
648 | 648 | ||
649 | void irq_dispose_mapping(unsigned int virq) | 649 | void irq_dispose_mapping(unsigned int virq) |
650 | { | 650 | { |
651 | struct irq_host *host = irq_map[virq].host; | 651 | struct irq_host *host; |
652 | irq_hw_number_t hwirq; | 652 | irq_hw_number_t hwirq; |
653 | unsigned long flags; | 653 | unsigned long flags; |
654 | 654 | ||
655 | if (virq == NO_IRQ) | ||
656 | return; | ||
657 | |||
658 | host = irq_map[virq].host; | ||
655 | WARN_ON (host == NULL); | 659 | WARN_ON (host == NULL); |
656 | if (host == NULL) | 660 | if (host == NULL) |
657 | return; | 661 | return; |