diff options
Diffstat (limited to 'arch/sh/cchips/hd6446x/hd64461/setup.c')
-rw-r--r-- | arch/sh/cchips/hd6446x/hd64461/setup.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c index ad126016720f..38f1e8171a3a 100644 --- a/arch/sh/cchips/hd6446x/hd64461/setup.c +++ b/arch/sh/cchips/hd6446x/hd64461/setup.c | |||
@@ -11,36 +11,28 @@ | |||
11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
14 | |||
15 | #include <asm/io.h> | 14 | #include <asm/io.h> |
16 | #include <asm/irq.h> | 15 | #include <asm/irq.h> |
17 | 16 | #include <asm/hd64461.h> | |
18 | #include <asm/hd64461/hd64461.h> | ||
19 | 17 | ||
20 | static void disable_hd64461_irq(unsigned int irq) | 18 | static void disable_hd64461_irq(unsigned int irq) |
21 | { | 19 | { |
22 | unsigned long flags; | ||
23 | unsigned short nimr; | 20 | unsigned short nimr; |
24 | unsigned short mask = 1 << (irq - HD64461_IRQBASE); | 21 | unsigned short mask = 1 << (irq - HD64461_IRQBASE); |
25 | 22 | ||
26 | local_irq_save(flags); | ||
27 | nimr = inw(HD64461_NIMR); | 23 | nimr = inw(HD64461_NIMR); |
28 | nimr |= mask; | 24 | nimr |= mask; |
29 | outw(nimr, HD64461_NIMR); | 25 | outw(nimr, HD64461_NIMR); |
30 | local_irq_restore(flags); | ||
31 | } | 26 | } |
32 | 27 | ||
33 | static void enable_hd64461_irq(unsigned int irq) | 28 | static void enable_hd64461_irq(unsigned int irq) |
34 | { | 29 | { |
35 | unsigned long flags; | ||
36 | unsigned short nimr; | 30 | unsigned short nimr; |
37 | unsigned short mask = 1 << (irq - HD64461_IRQBASE); | 31 | unsigned short mask = 1 << (irq - HD64461_IRQBASE); |
38 | 32 | ||
39 | local_irq_save(flags); | ||
40 | nimr = inw(HD64461_NIMR); | 33 | nimr = inw(HD64461_NIMR); |
41 | nimr &= ~mask; | 34 | nimr &= ~mask; |
42 | outw(nimr, HD64461_NIMR); | 35 | outw(nimr, HD64461_NIMR); |
43 | local_irq_restore(flags); | ||
44 | } | 36 | } |
45 | 37 | ||
46 | static void mask_and_ack_hd64461(unsigned int irq) | 38 | static void mask_and_ack_hd64461(unsigned int irq) |