diff options
| author |   Kyle McMartin <kyle@redhat.com> | 2010-10-14 22:31:25 -0400 |
|---|---|---|
| committer |   Matt Turner <mattst88@monolith.freenet-rz.de> | 2011-01-17 05:42:12 +0100 |
| commit | a891b393dd7f6ed84ecee98c0eac4a808ff2cbbc (patch) | |
| tree | ab4ee31ef54691f492e77dfc2d937f62c055cb1a /arch/alpha/kernel/irq_pyxis.c | |
| parent | alpha: use set_irq_chip and push down __do_IRQ to the machine types (diff) | |
| download | linux-dev-a891b393dd7f6ed84ecee98c0eac4a808ff2cbbc.tar.xz linux-dev-a891b393dd7f6ed84ecee98c0eac4a808ff2cbbc.zip | |
alpha: irq clean up
Stop touching irq_desc[irq] directly, instead use accessor
functions provided. Use irq_has_action instead of directly
testing the irq_desc.
Tested-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Kyle McMartin <kyle@redhat.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha/kernel/irq_pyxis.c')
| -rw-r--r-- | arch/alpha/kernel/irq_pyxis.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/alpha/kernel/irq_pyxis.c b/arch/alpha/kernel/irq_pyxis.c index 4e1904cd0fc0..9f603cfd440a 100644 --- a/arch/alpha/kernel/irq_pyxis.c +++ b/arch/alpha/kernel/irq_pyxis.c @@ -50,7 +50,8 @@ pyxis_startup_irq(unsigned int irq) static void pyxis_end_irq(unsigned int irq) { - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) + struct irq_desc *desc = irq_to_desc(irq); + if (desc || !(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS))) pyxis_enable_irq(irq); } @@ -120,7 +121,7 @@ init_pyxis_irqs(unsigned long ignore_mask) if ((ignore_mask >> i) & 1) continue; set_irq_chip_and_handler(i, &pyxis_irq_type, alpha_do_IRQ); - irq_desc[i].status |= IRQ_LEVEL; + irq_to_desc(i)->status |= IRQ_LEVEL; } setup_irq(16+7, &isa_cascade_irqaction); |