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/sys_marvel.c | |
| parent | alpha: use set_irq_chip and push down __do_IRQ to the machine types (diff) | |
| download | wireguard-linux-a891b393dd7f6ed84ecee98c0eac4a808ff2cbbc.tar.xz wireguard-linux-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/sys_marvel.c')
| -rw-r--r-- | arch/alpha/kernel/sys_marvel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c index 0d0699eef08c..a5095e09b805 100644 --- a/arch/alpha/kernel/sys_marvel.c +++ b/arch/alpha/kernel/sys_marvel.c @@ -153,7 +153,7 @@ io7_startup_irq(unsigned int irq) static void io7_end_irq(unsigned int irq) { - if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) + if (!(irq_to_desc(irq)->status & (IRQ_DISABLED|IRQ_INPROGRESS))) io7_enable_irq(irq); } @@ -304,7 +304,7 @@ init_io7_irqs(struct io7 *io7, /* Set up the lsi irqs. */ for (i = 0; i < 128; ++i) { - irq_desc[base + i].status |= IRQ_LEVEL; + irq_to_desc(base + i)->status |= IRQ_LEVEL; set_irq_chip_and_handler(base + i, lsi_ops, alpha_do_IRQ); } @@ -318,7 +318,7 @@ init_io7_irqs(struct io7 *io7, /* Set up the msi irqs. */ for (i = 128; i < (128 + 512); ++i) { - irq_desc[base + i].status |= IRQ_LEVEL; + irq_to_desc(base + i)->status |= IRQ_LEVEL; set_irq_chip_and_handler(base + i, msi_ops, alpha_do_IRQ); } |