From 55e1aff6ae5eb61831416ee9e344b1d8c5244633 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Sat, 1 Jul 2006 04:35:45 -0700
Subject: [PATCH] --- yaml --- r: 31535 b: refs/heads/master c:
 e8c4b9d003e72199a705fb5a40fcd2487fa16933 h: refs/heads/master i:   31533:
 846ccaf3553954114a29a81b8cf61bd4a72e2e40   31531:
 826ec790dbf9f110b6f05bd3d5b6181a8c001f3b   31527:
 7611c800780e880f9673f3f1fab477c7868394f9   31519:
 d35020d23e147e8b8bd7d11f86323b4adb1fd14a v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/irq/manage.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d318e8c4361c..751ba8060c23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17311c03c3e2c16d64d9e8cb2a3f45be2e2f8d3b
+refs/heads/master: e8c4b9d003e72199a705fb5a40fcd2487fa16933
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index e3a122931e1a..fcce5181e453 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -114,7 +114,7 @@ void enable_irq(unsigned int irq)
 	spin_lock_irqsave(&desc->lock, flags);
 	switch (desc->depth) {
 	case 0:
-		printk(KERN_WARNING "Unablanced enable_irq(%d)\n", irq);
+		printk(KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);
 		WARN_ON(1);
 		break;
 	case 1: {
@@ -267,9 +267,10 @@ int setup_irq(unsigned int irq, struct irqaction *new)
 				 * SA_TRIGGER_* but the PIC does not support
 				 * multiple flow-types?
 				 */
-				printk(KERN_WARNING "setup_irq(%d) SA_TRIGGER"
-				       "set. No set_type function available\n",
-				       irq);
+				printk(KERN_WARNING "No SA_TRIGGER set_type "
+				       "function for IRQ %d (%s)\n", irq,
+				       desc->chip ? desc->chip->name :
+				       "unknown");
 		} else
 			compat_irq_chip_set_default_handler(desc);
 
@@ -299,7 +300,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
 mismatch:
 	spin_unlock_irqrestore(&desc->lock, flags);
 	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();
 	}
 	return -EBUSY;
@@ -366,7 +367,7 @@ void free_irq(unsigned int irq, void *dev_id)
 			kfree(action);
 			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);
 		return;
 	}