Commit 7e97b3dc authored by Lukasz Luba's avatar Lukasz Luba Committed by Viresh Kumar
Browse files

arch_topology: Remove unused topology_set_thermal_pressure() and related 



There is no need of this function (and related) since code has been
converted to use the new arch_update_thermal_pressure() API. The old
code can be removed.

Signed-off-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 0258cb19

arch/arm/include/asm/topology.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


/* Replace task scheduler's default thermal pressure API */

#define arch_scale_thermal_pressure topology_get_thermal_pressure

#define arch_set_thermal_pressure   topology_set_thermal_pressure

#define arch_update_thermal_pressure	topology_update_thermal_pressure



#else

arch/arm64/include/asm/topology.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ void update_freq_counters_refs(void); 


/* Replace task scheduler's default thermal pressure API */

#define arch_scale_thermal_pressure topology_get_thermal_pressure

#define arch_set_thermal_pressure   topology_set_thermal_pressure

#define arch_update_thermal_pressure	topology_update_thermal_pressure



#include <asm-generic/topology.h>

drivers/base/arch_topology.c

+5 −12
Original line number Diff line number Diff line
@@ -156,16 +156,6 @@ void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity) 


DEFINE_PER_CPU(unsigned long, thermal_pressure);



void topology_set_thermal_pressure(const struct cpumask *cpus,

			       unsigned long th_pressure)

{

	int cpu;



	for_each_cpu(cpu, cpus)

		WRITE_ONCE(per_cpu(thermal_pressure, cpu), th_pressure);

}

EXPORT_SYMBOL_GPL(topology_set_thermal_pressure);



/**

 * topology_update_thermal_pressure() - Update thermal pressure for CPUs

 * @cpus        : The related CPUs for which capacity has been reduced
@@ -183,7 +173,7 @@ EXPORT_SYMBOL_GPL(topology_set_thermal_pressure); 
void topology_update_thermal_pressure(const struct cpumask *cpus,

				      unsigned long capped_freq)

{

	unsigned long max_capacity, capacity;

	unsigned long max_capacity, capacity, th_pressure;

	u32 max_freq;

	int cpu;
@@ -203,7 +193,10 @@ void topology_update_thermal_pressure(const struct cpumask *cpus, 
	else

		capacity = mult_frac(max_capacity, capped_freq, max_freq);



	arch_set_thermal_pressure(cpus, max_capacity - capacity);

	th_pressure = max_capacity - capacity;



	for_each_cpu(cpu, cpus)

		WRITE_ONCE(per_cpu(thermal_pressure, cpu), th_pressure);

}

EXPORT_SYMBOL_GPL(topology_update_thermal_pressure);

include/linux/arch_topology.h

+0 −3
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ static inline unsigned long topology_get_thermal_pressure(int cpu) 
	return per_cpu(thermal_pressure, cpu);

}



void topology_set_thermal_pressure(const struct cpumask *cpus,

				   unsigned long th_pressure);



void topology_update_thermal_pressure(const struct cpumask *cpus,

				      unsigned long capped_freq);

include/linux/sched/topology.h

+0 −7
Original line number Diff line number Diff line
@@ -266,13 +266,6 @@ unsigned long arch_scale_thermal_pressure(int cpu) 
}

#endif



#ifndef arch_set_thermal_pressure

static __always_inline

void arch_set_thermal_pressure(const struct cpumask *cpus,

			       unsigned long th_pressure)

{ }

#endif



#ifndef arch_update_thermal_pressure

static __always_inline

void arch_update_thermal_pressure(const struct cpumask *cpus,