diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-02 08:21:26 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-02 08:21:26 (GMT) |
commit | d6d5aeb661fc14655c417f3582ae7ec52985d2a8 (patch) | |
tree | 5e168da05cb28d10b5accc74718428cfd5527201 /kernel/irq/chip.c | |
parent | 7e6e178ab1548c8d894a77593e757acf4510b8ba (diff) | |
parent | 94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff) | |
download | linux-fsl-qoriq-d6d5aeb661fc14655c417f3582ae7ec52985d2a8.tar.xz |
Merge commit 'v2.6.27-rc8' into genirq
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r-- | kernel/irq/chip.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 240c64d..d663338 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -28,8 +28,7 @@ void dynamic_irq_init(unsigned int irq) unsigned long flags; if (irq >= NR_IRQS) { - printk(KERN_ERR "Trying to initialize invalid IRQ%d\n", irq); - WARN_ON(1); + WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq); return; } @@ -62,8 +61,7 @@ void dynamic_irq_cleanup(unsigned int irq) unsigned long flags; if (irq >= NR_IRQS) { - printk(KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq); - WARN_ON(1); + WARN(1, KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq); return; } @@ -71,9 +69,8 @@ void dynamic_irq_cleanup(unsigned int irq) spin_lock_irqsave(&desc->lock, flags); if (desc->action) { 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); - WARN_ON(1); return; } desc->msi_desc = NULL; @@ -96,8 +93,7 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip) unsigned long flags; if (irq >= NR_IRQS) { - printk(KERN_ERR "Trying to install chip for IRQ%d\n", irq); - WARN_ON(1); + WARN(1, KERN_ERR "Trying to install chip for IRQ%d\n", irq); return -EINVAL; } |