diff options
Diffstat (limited to 'arch/arm/mach-h720x/cpu-h7202.c')
-rw-r--r-- | arch/arm/mach-h720x/cpu-h7202.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c index fd33a19c813a..ac3f91442376 100644 --- a/arch/arm/mach-h720x/cpu-h7202.c +++ b/arch/arm/mach-h720x/cpu-h7202.c | |||
@@ -141,27 +141,27 @@ h7202_timer_interrupt(int irq, void *dev_id) | |||
141 | /* | 141 | /* |
142 | * mask multiplexed timer IRQs | 142 | * mask multiplexed timer IRQs |
143 | */ | 143 | */ |
144 | static void inline mask_timerx_irq (u32 irq) | 144 | static void inline mask_timerx_irq(struct irq_data *d) |
145 | { | 145 | { |
146 | unsigned int bit; | 146 | unsigned int bit; |
147 | bit = 2 << ((irq == IRQ_TIMER64B) ? 4 : (irq - IRQ_TIMER1)); | 147 | bit = 2 << ((d->irq == IRQ_TIMER64B) ? 4 : (d->irq - IRQ_TIMER1)); |
148 | CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) &= ~bit; | 148 | CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) &= ~bit; |
149 | } | 149 | } |
150 | 150 | ||
151 | /* | 151 | /* |
152 | * unmask multiplexed timer IRQs | 152 | * unmask multiplexed timer IRQs |
153 | */ | 153 | */ |
154 | static void inline unmask_timerx_irq (u32 irq) | 154 | static void inline unmask_timerx_irq(struct irq_data *d) |
155 | { | 155 | { |
156 | unsigned int bit; | 156 | unsigned int bit; |
157 | bit = 2 << ((irq == IRQ_TIMER64B) ? 4 : (irq - IRQ_TIMER1)); | 157 | bit = 2 << ((d->irq == IRQ_TIMER64B) ? 4 : (d->irq - IRQ_TIMER1)); |
158 | CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) |= bit; | 158 | CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) |= bit; |
159 | } | 159 | } |
160 | 160 | ||
161 | static struct irq_chip h7202_timerx_chip = { | 161 | static struct irq_chip h7202_timerx_chip = { |
162 | .ack = mask_timerx_irq, | 162 | .irq_ack = mask_timerx_irq, |
163 | .mask = mask_timerx_irq, | 163 | .irq_mask = mask_timerx_irq, |
164 | .unmask = unmask_timerx_irq, | 164 | .irq_unmask = unmask_timerx_irq, |
165 | }; | 165 | }; |
166 | 166 | ||
167 | static struct irqaction h7202_timer_irq = { | 167 | static struct irqaction h7202_timer_irq = { |