From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 9 Dec 2005 12:09:22 +0000 (+0000)
Subject: MIPS: MIPS boards: Get rid of useless SMP/non-SMP casing.
X-Git-Tag: v2.6.16-rc1~462^2~13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e6df65dc2bae8e7ad17ff81611ddc850b279cd;p=linux-2.6

MIPS: MIPS boards: Get rid of useless SMP/non-SMP casing.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index 72a12d931c..2830f656fe 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -77,7 +77,6 @@ static void mips_timer_dispatch (struct pt_regs *regs)
 
 irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-#ifdef CONFIG_SMP
 	int cpu = smp_processor_id();
 
 	if (cpu == 0) {
@@ -85,10 +84,9 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 		 * CPU 0 handles the global timer interrupt job and process accounting
 		 * resets count/compare registers to trigger next timer int.
 		 */
-		(void) timer_interrupt(irq, dev_id, regs);
+		timer_interrupt(irq, dev_id, regs);
 		scroll_display_message();
-	}
-	else {
+	} else {
 		/* Everyone else needs to reset the timer int here as
 		   ll_local_timer_interrupt doesn't */
 		/*
@@ -104,15 +102,6 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	}
 
 	return IRQ_HANDLED;
-#else
-	irqreturn_t r;
-
-	r = timer_interrupt(irq, dev_id, regs);
-
-	scroll_display_message();
-
-	return r;
-#endif
 }
 
 /*