Skip to content

Commit

Permalink
MIPS: cevt-r4k: Cleanup c0_compare_interrupt.
Browse files Browse the repository at this point in the history
The attempt to get gcc to generate best possible code turned
c0_compare_interrupt() into a bit of Italian pasta code.  Tweak for
sanity.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Mar 31, 2015
1 parent 7dfe819 commit f0c5b89
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions arch/mips/kernel/cevt-r4k.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ irqreturn_t c0_compare_interrupt(int irq, void *dev_id)
* the performance counter interrupt handler anyway.
*/
if (handle_perf_irq(r2))
goto out;
return IRQ_HANDLED;

/*
* The same applies to performance counter interrupts. But with the
Expand All @@ -80,12 +80,11 @@ irqreturn_t c0_compare_interrupt(int irq, void *dev_id)
write_c0_compare(read_c0_compare());
cd = &per_cpu(mips_clockevent_device, cpu);
cd->event_handler(cd);
} else {
return IRQ_NONE;

return IRQ_HANDLED;
}

out:
return IRQ_HANDLED;
return IRQ_NONE;
}

struct irqaction c0_compare_irqaction = {
Expand Down

0 comments on commit f0c5b89

Please sign in to comment.