diff options
Diffstat (limited to 'arch/sh/boards/mpc1211/setup.c')
-rw-r--r-- | arch/sh/boards/mpc1211/setup.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/sh/boards/mpc1211/setup.c b/arch/sh/boards/mpc1211/setup.c index a8c5180ae219..e9c8ff221dda 100644 --- a/arch/sh/boards/mpc1211/setup.c +++ b/arch/sh/boards/mpc1211/setup.c | |||
@@ -80,9 +80,6 @@ volatile unsigned long irq_err_count; | |||
80 | 80 | ||
81 | static void disable_mpc1211_irq(unsigned int irq) | 81 | static void disable_mpc1211_irq(unsigned int irq) |
82 | { | 82 | { |
83 | unsigned long flags; | ||
84 | |||
85 | save_and_cli(flags); | ||
86 | if( irq < 8) { | 83 | if( irq < 8) { |
87 | m_irq_mask |= (1 << irq); | 84 | m_irq_mask |= (1 << irq); |
88 | outb(m_irq_mask,I8259_M_MR); | 85 | outb(m_irq_mask,I8259_M_MR); |
@@ -90,16 +87,11 @@ static void disable_mpc1211_irq(unsigned int irq) | |||
90 | s_irq_mask |= (1 << (irq - 8)); | 87 | s_irq_mask |= (1 << (irq - 8)); |
91 | outb(s_irq_mask,I8259_S_MR); | 88 | outb(s_irq_mask,I8259_S_MR); |
92 | } | 89 | } |
93 | restore_flags(flags); | ||
94 | 90 | ||
95 | } | 91 | } |
96 | 92 | ||
97 | static void enable_mpc1211_irq(unsigned int irq) | 93 | static void enable_mpc1211_irq(unsigned int irq) |
98 | { | 94 | { |
99 | unsigned long flags; | ||
100 | |||
101 | save_and_cli(flags); | ||
102 | |||
103 | if( irq < 8) { | 95 | if( irq < 8) { |
104 | m_irq_mask &= ~(1 << irq); | 96 | m_irq_mask &= ~(1 << irq); |
105 | outb(m_irq_mask,I8259_M_MR); | 97 | outb(m_irq_mask,I8259_M_MR); |
@@ -107,7 +99,6 @@ static void enable_mpc1211_irq(unsigned int irq) | |||
107 | s_irq_mask &= ~(1 << (irq - 8)); | 99 | s_irq_mask &= ~(1 << (irq - 8)); |
108 | outb(s_irq_mask,I8259_S_MR); | 100 | outb(s_irq_mask,I8259_S_MR); |
109 | } | 101 | } |
110 | restore_flags(flags); | ||
111 | } | 102 | } |
112 | 103 | ||
113 | static inline int mpc1211_irq_real(unsigned int irq) | 104 | static inline int mpc1211_irq_real(unsigned int irq) |
@@ -131,10 +122,6 @@ static inline int mpc1211_irq_real(unsigned int irq) | |||
131 | 122 | ||
132 | static void mask_and_ack_mpc1211(unsigned int irq) | 123 | static void mask_and_ack_mpc1211(unsigned int irq) |
133 | { | 124 | { |
134 | unsigned long flags; | ||
135 | |||
136 | save_and_cli(flags); | ||
137 | |||
138 | if(irq < 8) { | 125 | if(irq < 8) { |
139 | if(m_irq_mask & (1<<irq)){ | 126 | if(m_irq_mask & (1<<irq)){ |
140 | if(!mpc1211_irq_real(irq)){ | 127 | if(!mpc1211_irq_real(irq)){ |
@@ -162,7 +149,6 @@ static void mask_and_ack_mpc1211(unsigned int irq) | |||
162 | outb(0x60+(irq-8),I8259_S_CR); /* EOI */ | 149 | outb(0x60+(irq-8),I8259_S_CR); /* EOI */ |
163 | outb(0x60+2,I8259_M_CR); | 150 | outb(0x60+2,I8259_M_CR); |
164 | } | 151 | } |
165 | restore_flags(flags); | ||
166 | } | 152 | } |
167 | 153 | ||
168 | static void end_mpc1211_irq(unsigned int irq) | 154 | static void end_mpc1211_irq(unsigned int irq) |