瀏覽代碼

MIPS: cevt-r4k: Cleanup c0_compare_interrupt.

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>
Ralf Baechle 10 年之前
父節點
當前提交
f0c5b8944b
共有 1 個文件被更改,包括 4 次插入5 次删除
  1. 4 5
      arch/mips/kernel/cevt-r4k.c

+ 4 - 5
arch/mips/kernel/cevt-r4k.c

@@ -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
@@ -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 = {