redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] IRQ: warning message cleanup

Browse source 
Make warnings more consistent.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Bjorn Helgaas 2006-07-01 04:35:45 -07:00 committed by Linus Torvalds
parent 17311c03c3
commit e8c4b9d003
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kernel/irq/manage.c
View file

@ -114,7 +114,7 @@ void enable_irq(unsigned int irq)
spin_lock_irqsave(&desc->lock, flags); spin_lock_irqsave(&desc->lock, flags);
switch (desc->depth) { switch (desc->depth) {
case 0: case 0:
printk(KERN_WARNING "Unablanced enable_irq(%d)\n", irq); printk(KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);
WARN_ON(1); WARN_ON(1);
break; break;
case 1: { case 1: {
@ -267,9 +267,10 @@ int setup_irq(unsigned int irq, struct irqaction *new)
* SA_TRIGGER_* but the PIC does not support * SA_TRIGGER_* but the PIC does not support
* multiple flow-types? * multiple flow-types?
*/ */
printk(KERN_WARNING "setup_irq(%d) SA_TRIGGER" printk(KERN_WARNING "No SA_TRIGGER set_type "
"set. No set_type function available\n", "function for IRQ %d (%s)\n", irq,
irq); desc->chip ? desc->chip->name :
"unknown");
} else } else
compat_irq_chip_set_default_handler(desc); compat_irq_chip_set_default_handler(desc);
@ -299,7 +300,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
mismatch: mismatch:
spin_unlock_irqrestore(&desc->lock, flags); spin_unlock_irqrestore(&desc->lock, flags);
if (!(new->flags & SA_PROBEIRQ)) { if (!(new->flags & SA_PROBEIRQ)) {
printk(KERN_ERR "%s: irq handler mismatch\n", __FUNCTION__); printk(KERN_ERR "IRQ handler type mismatch for IRQ %d\n", irq);
dump_stack(); dump_stack();
} }
return -EBUSY; return -EBUSY;
@ -366,7 +367,7 @@ void free_irq(unsigned int irq, void *dev_id)
kfree(action); kfree(action);
return; return;
} }
printk(KERN_ERR "Trying to free free IRQ%d\n", irq); printk(KERN_ERR "Trying to free already-free IRQ %d\n", irq);
spin_unlock_irqrestore(&desc->lock, flags); spin_unlock_irqrestore(&desc->lock, flags);
return; return;
} }