aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/sys_alcor.c
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2010-10-14 22:31:11 -0400
committerMatt Turner <mattst88@monolith.freenet-rz.de>2011-01-17 05:42:11 +0100
commitd5ccde0a64c3dbe954a8a13a6ba9fb3b6d7c6225 (patch)
tree00a7c1a1fc1fa42fdc88bdab8a30e40e3dcaa775 /arch/alpha/kernel/sys_alcor.c
parentdrivers/nfc/pn544.c: fix min_t warnings (diff)
downloadlinux-dev-d5ccde0a64c3dbe954a8a13a6ba9fb3b6d7c6225.tar.xz
linux-dev-d5ccde0a64c3dbe954a8a13a6ba9fb3b6d7c6225.zip
alpha: use set_irq_chip and push down __do_IRQ to the machine types
Also kill superfluous IRQ_DISABLED initialization, since that's the default state of the irq_desc[i].status field. 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_alcor.c')
-rw-r--r--arch/alpha/kernel/sys_alcor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index 20a30b8b9655..d8c918384f2d 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -142,8 +142,8 @@ alcor_init_irq(void)
on while IRQ probing. */
if (i >= 16+20 && i <= 16+30)
continue;
- irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
- irq_desc[i].chip = &alcor_irq_type;
+ irq_desc[i].status |= IRQ_LEVEL;
+ set_irq_chip_and_handler(i, &alcor_irq_type, alpha_do_IRQ);
}
i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq;