diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2006-06-29 02:24:57 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 10:26:25 -0700 |
| commit | f1c2662cbc6a0a9772655649bdf579803d33470b (patch) | |
| tree | ab6d0cc97527941e038edf0532f3917fca0953f8 /kernel/irq | |
| parent | [PATCH] genirq: add SA_TRIGGER support (diff) | |
| download | linux-dev-f1c2662cbc6a0a9772655649bdf579803d33470b.tar.xz linux-dev-f1c2662cbc6a0a9772655649bdf579803d33470b.zip | |
[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>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/handle.c | 6 | ||||
| -rw-r--r-- | kernel/irq/manage.c | 2 | ||||
| -rw-r--r-- | kernel/irq/proc.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 3a2dbcc9e215..01fc7f79d74a 100644 --- 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 627d401c2979..9eb1d518ee1c 100644 --- 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 f60b85b61e8b..607c7809ad01 100644 --- 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; |