summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/sys_takara.c
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2010-10-15 04:31:25 +0200
committerMatt Turner <mattst88@monolith.freenet-rz.de>2011-01-17 05:42:12 +0100
commita891b393dd7f6ed84ecee98c0eac4a808ff2cbbc (patch)
treeab4ee31ef54691f492e77dfc2d937f62c055cb1a /arch/alpha/kernel/sys_takara.c
parentalpha: use set_irq_chip and push down __do_IRQ to the machine types (diff)
downloadlinux-a891b393dd7f6ed84ecee98c0eac4a808ff2cbbc.tar.xz
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_takara.c')
-rw-r--r--arch/alpha/kernel/sys_takara.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/sys_takara.c b/arch/alpha/kernel/sys_takara.c
index 00df4e7b8d7d..dc3c23265eff 100644
--- a/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@ -70,7 +70,7 @@ takara_startup_irq(unsigned int irq)
static void
takara_end_irq(unsigned int irq)
{
- if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+ if (!(irq_to_desc(irq)->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
takara_enable_irq(irq);
}
@@ -153,7 +153,7 @@ takara_init_irq(void)
takara_update_irq_hw(i, -1);
for (i = 16; i < 128; ++i) {
- irq_desc[i].status |= IRQ_LEVEL;
+ irq_to_desc(i)->status |= IRQ_LEVEL;
set_irq_chip_and_handler(i, &takara_irq_type, alpha_do_IRQ);
}