Commit 261c40c1 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds

use WARN() in kernel/irq/chip.c

Use WARN() instead of a printk+WARN_ON() pair; this way the message
becomes part of the warning section for better reporting/collection.
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4c8573e2
...@@ -28,8 +28,7 @@ void dynamic_irq_init(unsigned int irq) ...@@ -28,8 +28,7 @@ void dynamic_irq_init(unsigned int irq)
unsigned long flags; unsigned long flags;
if (irq >= NR_IRQS) { if (irq >= NR_IRQS) {
printk(KERN_ERR "Trying to initialize invalid IRQ%d\n", irq); WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);
WARN_ON(1);
return; return;
} }
...@@ -62,8 +61,7 @@ void dynamic_irq_cleanup(unsigned int irq) ...@@ -62,8 +61,7 @@ void dynamic_irq_cleanup(unsigned int irq)
unsigned long flags; unsigned long flags;
if (irq >= NR_IRQS) { if (irq >= NR_IRQS) {
printk(KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq); WARN(1, KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq);
WARN_ON(1);
return; return;
} }
...@@ -71,9 +69,8 @@ void dynamic_irq_cleanup(unsigned int irq) ...@@ -71,9 +69,8 @@ void dynamic_irq_cleanup(unsigned int irq)
spin_lock_irqsave(&desc->lock, flags); spin_lock_irqsave(&desc->lock, flags);
if (desc->action) { if (desc->action) {
spin_unlock_irqrestore(&desc->lock, flags); spin_unlock_irqrestore(&desc->lock, flags);
printk(KERN_ERR "Destroying IRQ%d without calling free_irq\n", WARN(1, KERN_ERR "Destroying IRQ%d without calling free_irq\n",
irq); irq);
WARN_ON(1);
return; return;
} }
desc->msi_desc = NULL; desc->msi_desc = NULL;
...@@ -96,8 +93,7 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip) ...@@ -96,8 +93,7 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip)
unsigned long flags; unsigned long flags;
if (irq >= NR_IRQS) { if (irq >= NR_IRQS) {
printk(KERN_ERR "Trying to install chip for IRQ%d\n", irq); WARN(1, KERN_ERR "Trying to install chip for IRQ%d\n", irq);
WARN_ON(1);
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment