[PATCH] MIPS: BCM1480: remove checks for CONFIG_SIBYTE_BCM1480_PROF

[PATCH] MIPS: BCM1480: remove checks for CONFIG_SIBYTE_BCM1480_PROF

[Paul Bolle]

There are two checks for CONFIG_SIBYTE_BCM1480_PROF in the tree since
v2.6.15. The related Kconfig symbol has never been added to the tree. So
these checks have always evaluated to false. Besides, one of these
checks guards a call of sbprof_cpu_intr(). But that function is not
defined. Remove all this.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
Untested.

Until v2.6.23 there also were checks for CONFIG_SIBYTE_SB1250_PROF in
the tree. There also was a Kconfig symbol SIBYTE_SB1250_PROF so it was
possible to make these checks evaluate to true. But, since one of these
checks also guarded a call of sbprof_cpu_intr(), that should have made
the build fail with an error.

 arch/mips/sibyte/bcm1480/irq.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 59cfe2659771..373fbbc8425c 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -347,19 +347,8 @@ asmlinkage void plat_irq_dispatch(void)
 	unsigned int cpu = smp_processor_id();
 	unsigned int pending;
 
-#ifdef CONFIG_SIBYTE_BCM1480_PROF
-	/* Set compare to count to silence count/compare timer interrupts */
-	write_c0_compare(read_c0_count());
-#endif
-
 	pending = read_c0_cause() & read_c0_status();
 
-#ifdef CONFIG_SIBYTE_BCM1480_PROF
-	if (pending & CAUSEF_IP7)	/* Cpu performance counter interrupt */
-		sbprof_cpu_intr();
-	else
-#endif
-
 	if (pending & CAUSEF_IP4)
 		do_IRQ(K_BCM1480_INT_TIMER_0 + cpu);
 #ifdef CONFIG_SMP
-- 
1.9.0

Re: [PATCH] MIPS: BCM1480: remove checks for CONFIG_SIBYTE_BCM1480_PROF

[Ralf Baechle]

On Thu, May 22, 2014 at 11:24:19AM +0200, Paul Bolle wrote:

> There are two checks for CONFIG_SIBYTE_BCM1480_PROF in the tree since
> v2.6.15. The related Kconfig symbol has never been added to the tree. So
> these checks have always evaluated to false. Besides, one of these
> checks guards a call of sbprof_cpu_intr(). But that function is not
> defined. Remove all this.
> 
> Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
> ---
> Untested.
> 
> Until v2.6.23 there also were checks for CONFIG_SIBYTE_SB1250_PROF in
> the tree. There also was a Kconfig symbol SIBYTE_SB1250_PROF so it was
> possible to make these checks evaluate to true. But, since one of these
> checks also guarded a call of sbprof_cpu_intr(), that should have made
> the build fail with an error.

The Sibyte profiling was far inferior to later solutions such as oprofile
or perf and non-standard anyway.  So let's kill what's left over.

  Ralf