diff options
author | Kyle McMartin <kyle@redhat.com> | 2010-10-14 22:31:25 -0400 |
---|---|---|
committer | Matt Turner <mattst88@monolith.freenet-rz.de> | 2011-01-16 23:42:12 -0500 |
commit | a891b393dd7f6ed84ecee98c0eac4a808ff2cbbc (patch) | |
tree | ab4ee31ef54691f492e77dfc2d937f62c055cb1a /arch/alpha/kernel/irq_srm.c | |
parent | d5ccde0a64c3dbe954a8a13a6ba9fb3b6d7c6225 (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/irq_srm.c')
-rw-r--r-- | arch/alpha/kernel/irq_srm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/irq_srm.c b/arch/alpha/kernel/irq_srm.c index b337cfc9d6bb..ea790069dfbb 100644 --- a/arch/alpha/kernel/irq_srm.c +++ b/arch/alpha/kernel/irq_srm.c | |||
@@ -43,7 +43,7 @@ srm_startup_irq(unsigned int irq) | |||
43 | static void | 43 | static void |
44 | srm_end_irq(unsigned int irq) | 44 | srm_end_irq(unsigned int irq) |
45 | { | 45 | { |
46 | if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS))) | 46 | if (!(irq_to_desc(irq)->status & (IRQ_DISABLED|IRQ_INPROGRESS))) |
47 | srm_enable_irq(irq); | 47 | srm_enable_irq(irq); |
48 | } | 48 | } |
49 | 49 | ||
@@ -68,8 +68,8 @@ init_srm_irqs(long max, unsigned long ignore_mask) | |||
68 | for (i = 16; i < max; ++i) { | 68 | for (i = 16; i < max; ++i) { |
69 | if (i < 64 && ((ignore_mask >> i) & 1)) | 69 | if (i < 64 && ((ignore_mask >> i) & 1)) |
70 | continue; | 70 | continue; |
71 | irq_desc[i].status |= IRQ_LEVEL; | ||
72 | set_irq_chip_and_handler(i, &srm_irq_type, alpha_do_IRQ); | 71 | set_irq_chip_and_handler(i, &srm_irq_type, alpha_do_IRQ); |
72 | irq_to_desc(i)->status |= IRQ_LEVEL; | ||
73 | } | 73 | } |
74 | } | 74 | } |
75 | 75 | ||