diff options
Diffstat (limited to 'arch/mips/au1000/common/irq.c')
-rw-r--r-- | arch/mips/au1000/common/irq.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c index f0626992fd75..40c6ceceb5f9 100644 --- a/arch/mips/au1000/common/irq.c +++ b/arch/mips/au1000/common/irq.c | |||
@@ -210,10 +210,8 @@ static inline void mask_and_ack_either_edge_irq(unsigned int irq_nr) | |||
210 | au_sync(); | 210 | au_sync(); |
211 | } | 211 | } |
212 | 212 | ||
213 | |||
214 | static inline void mask_and_ack_level_irq(unsigned int irq_nr) | 213 | static inline void mask_and_ack_level_irq(unsigned int irq_nr) |
215 | { | 214 | { |
216 | |||
217 | local_disable_irq(irq_nr); | 215 | local_disable_irq(irq_nr); |
218 | au_sync(); | 216 | au_sync(); |
219 | #if defined(CONFIG_MIPS_PB1000) | 217 | #if defined(CONFIG_MIPS_PB1000) |
@@ -263,14 +261,14 @@ void restore_local_and_enable(int controller, unsigned long mask) | |||
263 | unsigned long flags, new_mask; | 261 | unsigned long flags, new_mask; |
264 | 262 | ||
265 | spin_lock_irqsave(&irq_lock, flags); | 263 | spin_lock_irqsave(&irq_lock, flags); |
266 | for (i = 0; i < 32; i++) { | 264 | for (i = 0; i < 32; i++) |
267 | if (mask & (1 << i)) { | 265 | if (mask & (1 << i)) { |
268 | if (controller) | 266 | if (controller) |
269 | local_enable_irq(i + 32); | 267 | local_enable_irq(i + 32); |
270 | else | 268 | else |
271 | local_enable_irq(i); | 269 | local_enable_irq(i); |
272 | } | 270 | } |
273 | } | 271 | |
274 | if (controller) | 272 | if (controller) |
275 | new_mask = au_readl(IC1_MASKSET); | 273 | new_mask = au_readl(IC1_MASKSET); |
276 | else | 274 | else |