Skip to content

Commit

Permalink
arm: h720x: Fix irq conversion fallout
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner committed Mar 29, 2011
1 parent 4fe25e3 commit 1738209
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions arch/arm/mach-h720x/cpu-h7202.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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 );
Expand Down

0 comments on commit 1738209

Please sign in to comment.