[PATCH] genirq: cleanup: no_irq_type -> no_irq_chip rename

Rename no_irq_type to no_irq_chip.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 3a2dbcc9e215d21e8423180c57fd8e172f1735b9..01fc7f79d74a4508ec9cc35dc8d05a29f40524dc 100644 (file)
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -45,7 +45,7 @@ handle_bad_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
 struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = {
        [0 ... NR_IRQS-1] = {
                .status = IRQ_DISABLED,
-               .chip = &no_irq_type,
+               .chip = &no_irq_chip,
                .handle_irq = handle_bad_irq,
                .depth = 1,
                .lock = SPIN_LOCK_UNLOCKED,
@@ -79,8 +79,8 @@ static unsigned int noop_ret(unsigned int irq)
 /*
  * Generic no controller implementation
  */
-struct hw_interrupt_type no_irq_type = {
-       .typename       = "none",
+struct irq_chip no_irq_chip = {
+       .name           = "none",
        .startup        = noop_ret,
        .shutdown       = noop,
        .enable         = noop,

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 627d401c2979bbfd1c564098c4bb4223e1412452..9eb1d518ee1c8dc8da68f7903cd207482352e8fa 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -199,7 +199,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
        if (irq >= NR_IRQS)
                return -EINVAL;
 
-       if (desc->chip == &no_irq_type)
+       if (desc->chip == &no_irq_chip)
                return -ENOSYS;
        /*
         * Some drivers like serial.c use request_irq() heavily,

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index f60b85b61e8bbd5de5e0dfc3e170d2544c14c6d5..607c7809ad0125e7aad8d28a308319601a7223ea 100644 (file)
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -117,7 +117,7 @@ void register_irq_proc(unsigned int irq)
        char name [MAX_NAMELEN];
 
        if (!root_irq_dir ||
-               (irq_desc[irq].chip == &no_irq_type) ||
+               (irq_desc[irq].chip == &no_irq_chip) ||
                        irq_desc[irq].dir)
                return;