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: Lukasz Luba <lukasz.luba@arm.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h
index f1eafacc9a300a4a31a7215e9ab43a4306b2f1f1..c7d2510e5a786fec9f77852eb4a285117dcedaad 100644 (file)
--- a/arch/arm/include/asm/topology.h
+++ b/arch/arm/include/asm/topology.h
@@ -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

diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h
index 7a421cbc99ed0d5734136e7d6b8761a326ee4978..f386b90a79c85d01e970088b67e0c48a64bdc574 100644 (file)
--- a/arch/arm64/include/asm/topology.h
+++ b/arch/arm64/include/asm/topology.h
@@ -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>

diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index a3ae0b4eea09a9630887760d71e844042ec829a6..976154140f0b00660df7f940f90267d1a2a63387 100644 (file)
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -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);
 

diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h
index ace1e5dcf77392db304c5e3f907744fa598ecfb2..cce6136b300a6445bb416e4d7f9691ab265657c0 100644 (file)
--- a/include/linux/arch_topology.h
+++ b/include/linux/arch_topology.h
@@ -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);
 

diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h
index 6e89a8e43aa7a08aaaadfed914a248353c7c1c22..8054641c0a7bfe71f4fbc6c823c7a68dc21e7a0c 100644 (file)
--- a/include/linux/sched/topology.h
+++ b/include/linux/sched/topology.h
@@ -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,

diff --git a/init/Kconfig b/init/Kconfig
index 036b750e8d8a8b74007da9f9568b775bb349a857..086fd11348e003a812bd12e7ad693cd8bfd3a306 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -550,7 +550,7 @@ config SCHED_THERMAL_PRESSURE
          i.e. put less load on throttled CPUs than on non/less throttled ones.
 
          This requires the architecture to implement
-         arch_set_thermal_pressure() and arch_scale_thermal_pressure().
+         arch_update_thermal_pressure() and arch_scale_thermal_pressure().
 
 config BSD_PROCESS_ACCT
        bool "BSD Process Accounting"