From: Ingo Molnar Rename no_irq_type to no_irq_chip. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton --- kernel/irq/handle.c | 6 +++--- kernel/irq/manage.c | 2 +- kernel/irq/proc.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff -puN kernel/irq/handle.c~genirq-cleanup-no_irq_type-no_irq_chip-rename kernel/irq/handle.c --- devel/kernel/irq/handle.c~genirq-cleanup-no_irq_type-no_irq_chip-rename 2006-05-29 16:21:38.000000000 -0700 +++ devel-akpm/kernel/irq/handle.c 2006-05-29 16:46:30.000000000 -0700 @@ -45,7 +45,7 @@ handle_bad_irq(unsigned int irq, struct 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 in /* * 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 -puN kernel/irq/manage.c~genirq-cleanup-no_irq_type-no_irq_chip-rename kernel/irq/manage.c --- devel/kernel/irq/manage.c~genirq-cleanup-no_irq_type-no_irq_chip-rename 2006-05-29 16:21:38.000000000 -0700 +++ devel-akpm/kernel/irq/manage.c 2006-05-29 16:46:29.000000000 -0700 @@ -199,7 +199,7 @@ int setup_irq(unsigned int irq, struct i 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 -puN kernel/irq/proc.c~genirq-cleanup-no_irq_type-no_irq_chip-rename kernel/irq/proc.c --- devel/kernel/irq/proc.c~genirq-cleanup-no_irq_type-no_irq_chip-rename 2006-05-29 16:21:38.000000000 -0700 +++ devel-akpm/kernel/irq/proc.c 2006-05-29 16:21:38.000000000 -0700 @@ -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; _