[PATCH] genirq: cleanup: no_irq_type -> no_irq_chip rename
Ingo Molnar [Thu, 29 Jun 2006 09:24:57 +0000 (02:24 -0700)]
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>

kernel/irq/handle.c
kernel/irq/manage.c
kernel/irq/proc.c

index 3a2dbcc..01fc7f7 100644 (file)
@@ -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,
index 627d401..9eb1d51 100644 (file)
@@ -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,
index f60b85b..607c780 100644 (file)
@@ -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;