aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/sys_alcor.c
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2010-10-14 22:31:25 -0400
committerMatt Turner <mattst88@monolith.freenet-rz.de>2011-01-16 23:42:12 -0500
commita891b393dd7f6ed84ecee98c0eac4a808ff2cbbc (patch)
treeab4ee31ef54691f492e77dfc2d937f62c055cb1a /arch/alpha/kernel/sys_alcor.c
parentd5ccde0a64c3dbe954a8a13a6ba9fb3b6d7c6225 (diff)
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_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 d8c918384f2d..138cc155299c 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -85,7 +85,7 @@ alcor_isa_mask_and_ack_irq(unsigned int irq)
85static void 85static void
86alcor_end_irq(unsigned int irq) 86alcor_end_irq(unsigned int irq)
87{ 87{
88 if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) 88 if (!(irq_to_desc(irq)->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
89 alcor_enable_irq(irq); 89 alcor_enable_irq(irq);
90} 90}
91 91
@@ -142,8 +142,8 @@ alcor_init_irq(void)
142 on while IRQ probing. */ 142 on while IRQ probing. */
143 if (i >= 16+20 && i <= 16+30) 143 if (i >= 16+20 && i <= 16+30)
144 continue; 144 continue;
145 irq_desc[i].status |= IRQ_LEVEL;
146 set_irq_chip_and_handler(i, &alcor_irq_type, alpha_do_IRQ); 145 set_irq_chip_and_handler(i, &alcor_irq_type, alpha_do_IRQ);
146 irq_to_desc(i)->status |= IRQ_LEVEL;
147 } 147 }
148 i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq; 148 i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq;
149 149