The vpe_id() macro is now used only in mipsxx_pmu_enable_event when CONFIG_CPU_BMIPS5000 is defined. Fold the one used definition of the macro into it's usage and remove the now unused definitions.
Signed-off-by: Matt Redfearn <[email protected]> --- arch/mips/kernel/perf_event_mipsxx.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c index bedb0d5ff3f2..44b9090a53cc 100644 --- a/arch/mips/kernel/perf_event_mipsxx.c +++ b/arch/mips/kernel/perf_event_mipsxx.c @@ -134,18 +134,6 @@ static int cpu_has_mipsmt_pertccounters; static DEFINE_SPINLOCK(core_counters_lock); static DEFINE_RWLOCK(pmuint_rwlock); - -#if defined(CONFIG_CPU_BMIPS5000) -#define vpe_id() (cpu_has_mipsmt_pertccounters ? \ - 0 : (smp_processor_id() & MIPS_CPUID_TO_COUNTER_MASK)) -#else -#define vpe_id() (cpu_has_mipsmt_pertccounters ? \ - 0 : cpu_vpe_id(¤t_cpu_data)) -#endif - -#else /* !CONFIG_MIPS_PERF_SHARED_TC_COUNTERS */ -#define vpe_id() 0 - #endif /* CONFIG_MIPS_PERF_SHARED_TC_COUNTERS */ static void resume_local_counters(void); @@ -381,8 +369,10 @@ static void mipsxx_pmu_enable_event(struct hw_perf_event *evt, int idx) if (IS_ENABLED(CONFIG_CPU_BMIPS5000)) { /* enable the counter for the calling thread */ - cpuc->saved_ctrl[idx] |= - (1 << (12 + vpe_id())) | BRCM_PERFCTRL_TC; + unsigned int vpe_id = cpu_has_mipsmt_pertccounters ? 0 : + (smp_processor_id() & MIPS_CPUID_TO_COUNTER_MASK); + + cpuc->saved_ctrl[idx] |= BIT(12 + vpe_id) | BRCM_PERFCTRL_TC; } else if (range > V) { /* The counter is processor wide. Set it up to count all TCs. */ pr_debug("Enabling perf counter for all TCs\n"); -- 2.7.4
