summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-h720x
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-28 10:54:40 +0200
committerThomas Gleixner <tglx@linutronix.de>2011-03-29 14:47:52 +0200
commit1738209a1500a10fe3cce0b11b81b5bb1c6dffbe (patch)
tree0f1add49360a3a0d6e6a328d7aa93b65f274f94a /arch/arm/mach-h720x
parent4fe25e3898ec53de322f32b67afa2be872f8ed21 (diff)
downloadop-kernel-dev-1738209a1500a10fe3cce0b11b81b5bb1c6dffbe.zip
op-kernel-dev-1738209a1500a10fe3cce0b11b81b5bb1c6dffbe.tar.gz
arm: h720x: Fix irq conversion fallout
The conversion missed, that one of the irq functions is called from the init code. Split it out, so the irq number based call works. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-h720x')
-rw-r--r--arch/arm/mach-h720x/cpu-h7202.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c
index ac3f914..bcf91a5 100644
--- a/arch/arm/mach-h720x/cpu-h7202.c
+++ b/arch/arm/mach-h720x/cpu-h7202.c
@@ -141,13 +141,18 @@ h7202_timer_interrupt(int irq, void *dev_id)
/*
* mask multiplexed timer IRQs
*/
-static void inline mask_timerx_irq(struct irq_data *d)
+static void inline __mask_timerx_irq(unsigned int irq)
{
unsigned int bit;
- bit = 2 << ((d->irq == IRQ_TIMER64B) ? 4 : (d->irq - IRQ_TIMER1));
+ bit = 2 << ((irq == IRQ_TIMER64B) ? 4 : (irq - IRQ_TIMER1));
CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) &= ~bit;
}
+static void inline mask_timerx_irq(struct irq_data *d)
+{
+ __mask_timerx_irq(d->irq);
+}
+
/*
* unmask multiplexed timer IRQs
*/
@@ -196,7 +201,7 @@ void __init h7202_init_irq (void)
for (irq = IRQ_TIMER1;
irq < IRQ_CHAINED_TIMERX(NR_TIMERX_IRQS); irq++) {
- mask_timerx_irq(irq);
+ __mask_timerx_irq(irq);
set_irq_chip(irq, &h7202_timerx_chip);
set_irq_handler(irq, handle_edge_irq);
set_irq_flags(irq, IRQF_VALID );
OpenPOWER on IntegriCloud