[patch 25/50] genirq: cleanup: no_irq_type -> no_irq_chip rename

[Ingo Molnar]

From: Ingo Molnar <mingo@xxxxxxx>

rename no_irq_type to no_irq_chip.

Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 kernel/irq/handle.c |    4 ++--
 kernel/irq/manage.c |    2 +-
 kernel/irq/proc.c   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Index: linux-genirq.q/kernel/irq/handle.c
===================================================================
--- linux-genirq.q.orig/kernel/irq/handle.c
+++ linux-genirq.q/kernel/irq/handle.c
@@ -47,7 +47,7 @@ handle_bad_irq(unsigned int irq, struct 
 struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = {
 	[0 ... NR_IRQS-1] = {
 		.status = IRQ_DISABLED,
-		.handler = &no_irq_type,
+		.handler = &no_irq_chip,
 		.handle = handle_bad_irq,
 		.lock = SPIN_LOCK_UNLOCKED,
 		.depth = 1,
@@ -76,7 +76,7 @@ static void noop(unsigned int irq)
 /*
  * Generic no controller implementation
  */
-struct hw_interrupt_type no_irq_type = {
+struct irq_chip no_irq_chip = {
 	.typename =	"none",
 	.enable =	noop,
 	.disable =	noop,
Index: linux-genirq.q/kernel/irq/manage.c
===================================================================
--- linux-genirq.q.orig/kernel/irq/manage.c
+++ linux-genirq.q/kernel/irq/manage.c
@@ -188,7 +188,7 @@ int setup_irq(unsigned int irq, struct i
 	if (irq >= NR_IRQS)
 		return -EINVAL;
 
-	if (desc->handler == &no_irq_type)
+	if (desc->handler == &no_irq_chip)
 		return -ENOSYS;
 	/*
 	 * Some drivers like serial.c use request_irq() heavily,
Index: linux-genirq.q/kernel/irq/proc.c
===================================================================
--- linux-genirq.q.orig/kernel/irq/proc.c
+++ linux-genirq.q/kernel/irq/proc.c
@@ -119,7 +119,7 @@ void register_irq_proc(unsigned int irq)
 	char name [MAX_NAMELEN];
 
 	if (!root_irq_dir ||
-		(irq_desc[irq].handler == &no_irq_type) ||
+		(irq_desc[irq].handler == &no_irq_chip) ||
 			irq_dir[irq])
 		return;
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/