[patch 1/2] genirq: allow usage of no_irq_chip

[Thomas Gleixner <tglx@linutronix.de>]

[-- Attachment #1: genirq-allow-usage-of-no-irq-chip.patch --]
[-- Type: text/plain, Size: 2099 bytes --]


Some dumb interrupt hardware has no way to ack/mask.... Instead of creating a
seperate chip structure we allow to reuse the already existing no_irq_chip

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

 kernel/irq/handle.c |    8 ++++++--
 kernel/irq/manage.c |    2 +-
 kernel/irq/proc.c   |    5 ++---
 3 files changed, 9 insertions(+), 6 deletions(-)

Index: linux-2.6.17-rc6-mm/kernel/irq/handle.c
===================================================================
--- linux-2.6.17-rc6-mm.orig/kernel/irq/handle.c	2006-06-10 10:32:51.000000000 +0200
+++ linux-2.6.17-rc6-mm/kernel/irq/handle.c	2006-06-10 10:42:22.000000000 +0200
@@ -63,8 +63,12 @@
  */
 static void ack_bad(unsigned int irq)
 {
-	print_irq_desc(irq, irq_desc + irq);
-	ack_bad_irq(irq);
+	struct irq_desc *desc = irq_desc + irq;
+
+	if (desc->handle_irq == handle_bad_irq) {
+		print_irq_desc(irq, desc);
+		ack_bad_irq(irq);
+	}
 }
 
 /*
@@ -89,6 +93,7 @@
 	.enable		= noop,
 	.disable	= noop,
 	.ack		= ack_bad,
+	.unmask		= noop,
 	.end		= noop,
 };
 
Index: linux-2.6.17-rc6-mm/kernel/irq/manage.c
===================================================================
--- linux-2.6.17-rc6-mm.orig/kernel/irq/manage.c	2006-06-10 10:32:53.000000000 +0200
+++ linux-2.6.17-rc6-mm/kernel/irq/manage.c	2006-06-10 10:42:22.000000000 +0200
@@ -199,7 +199,7 @@
 	if (irq >= NR_IRQS)
 		return -EINVAL;
 
-	if (desc->chip == &no_irq_chip)
+	if (desc->handle_irq == &handle_bad_irq)
 		return -ENOSYS;
 	/*
 	 * Some drivers like serial.c use request_irq() heavily,
Index: linux-2.6.17-rc6-mm/kernel/irq/proc.c
===================================================================
--- linux-2.6.17-rc6-mm.orig/kernel/irq/proc.c	2006-06-10 10:32:49.000000000 +0200
+++ linux-2.6.17-rc6-mm/kernel/irq/proc.c	2006-06-10 10:42:22.000000000 +0200
@@ -116,9 +116,8 @@
 {
 	char name [MAX_NAMELEN];
 
-	if (!root_irq_dir ||
-		(irq_desc[irq].chip == &no_irq_chip) ||
-			irq_desc[irq].dir)
+	if (!root_irq_dir || (irq_desc[irq].handle_irq == &handle_bad_irq) ||
+	    irq_desc[irq].dir)
 		return;
 
 	memset(name, 0, MAX_NAMELEN);

--