aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/irq_pyxis.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-16 23:42:11 -0500
commitd5ccde0a64c3dbe954a8a13a6ba9fb3b6d7c6225 (patch)
tree00a7c1a1fc1fa42fdc88bdab8a30e40e3dcaa775 /arch/alpha/kernel/irq_pyxis.c
parente78bf5e6cbe837daa6ab628a5f679548742994d3 (diff)
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/irq_pyxis.c')
-rw-r--r--arch/alpha/kernel/irq_pyxis.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/irq_pyxis.c b/arch/alpha/kernel/irq_pyxis.c
index 989ce46a0cf3..4e1904cd0fc0 100644
--- a/arch/alpha/kernel/irq_pyxis.c
+++ b/arch/alpha/kernel/irq_pyxis.c
@@ -119,8 +119,8 @@ init_pyxis_irqs(unsigned long ignore_mask)
119 for (i = 16; i < 48; ++i) { 119 for (i = 16; i < 48; ++i) {
120 if ((ignore_mask >> i) & 1) 120 if ((ignore_mask >> i) & 1)
121 continue; 121 continue;
122 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL; 122 set_irq_chip_and_handler(i, &pyxis_irq_type, alpha_do_IRQ);
123 irq_desc[i].chip = &pyxis_irq_type; 123 irq_desc[i].status |= IRQ_LEVEL;
124 } 124 }
125 125
126 setup_irq(16+7, &isa_cascade_irqaction); 126 setup_irq(16+7, &isa_cascade_irqaction);