alpha: irq clean up

[firefly-linux-kernel-4.4.55.git] / arch / alpha / kernel / sys_alcor.c

diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index d8c918384f2d5c8e26c3a286cd259e6659166785..138cc155299cb7507be328c6749b0b54e314ef37 100644 (file)
--- 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)
 static void
 alcor_end_irq(unsigned int irq)
 {
-       if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+       if (!(irq_to_desc(irq)->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
                alcor_enable_irq(irq);
 }
 
@@ -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_LEVEL;
                set_irq_chip_and_handler(i, &alcor_irq_type, alpha_do_IRQ);
+               irq_to_desc(i)->status |= IRQ_LEVEL;
        }
        i8259a_irq_type.ack = alcor_isa_mask_and_ack_irq;