arm,arm64,drivers: add a prefix to drivers arch_topology interfaces

Now that some functions that deal with arch topology information live
under drivers, there is a clash of naming that might create confusion.

Tidy things up by creating a topology namespace for interfaces used by
arch code; achieve this by prepending a 'topology_' prefix to driver
interfaces.

Signed-off-by: Juri Lelli <juri.lelli@arm.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 76c19aa0d82f..d1c33a85059e 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -25,12 +25,12 @@
 static DEFINE_MUTEX(cpu_scale_mutex);
 static DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;
 
-unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)
+unsigned long topology_get_cpu_scale(struct sched_domain *sd, int cpu)
 {
         return per_cpu(cpu_scale, cpu);
 }
 
-void set_capacity_scale(unsigned int cpu, unsigned long capacity)
+void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity)
 {
         per_cpu(cpu_scale, cpu) = capacity;
 }
@@ -42,7 +42,7 @@ static ssize_t cpu_capacity_show(struct device *dev,
         struct cpu *cpu = container_of(dev, struct cpu, dev);
 
         return sprintf(buf, "%lu\n",
-                        arch_scale_cpu_capacity(NULL, cpu->dev.id));
+                        topology_get_cpu_scale(NULL, cpu->dev.id));
 }
 
 static ssize_t cpu_capacity_store(struct device *dev,
@@ -67,7 +67,7 @@ static ssize_t cpu_capacity_store(struct device *dev,
 
         mutex_lock(&cpu_scale_mutex);
         for_each_cpu(i, &cpu_topology[this_cpu].core_sibling)
-                set_capacity_scale(i, new_capacity);
+                topology_set_cpu_scale(i, new_capacity);
         mutex_unlock(&cpu_scale_mutex);
 
         return count;
@@ -98,7 +98,7 @@ static u32 capacity_scale;
 static u32 *raw_capacity;
 static bool cap_parsing_failed;
 
-void normalize_cpu_capacity(void)
+void topology_normalize_cpu_scale(void)
 {
         u64 capacity;
         int cpu;
@@ -113,14 +113,14 @@ void normalize_cpu_capacity(void)
                          cpu, raw_capacity[cpu]);
                 capacity = (raw_capacity[cpu] << SCHED_CAPACITY_SHIFT)
                         / capacity_scale;
-                set_capacity_scale(cpu, capacity);
+                topology_set_cpu_scale(cpu, capacity);
                 pr_debug("cpu_capacity: CPU%d cpu_capacity=%lu\n",
-                        cpu, arch_scale_cpu_capacity(NULL, cpu));
+                        cpu, topology_get_cpu_scale(NULL, cpu));
         }
         mutex_unlock(&cpu_scale_mutex);
 }
 
-int __init parse_cpu_capacity(struct device_node *cpu_node, int cpu)
+int __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)
 {
         int ret = 1;
         u32 cpu_capacity;
@@ -185,12 +185,12 @@ init_cpu_capacity_callback(struct notifier_block *nb,
                                cpus_to_visit,
                                policy->related_cpus);
                 for_each_cpu(cpu, policy->related_cpus) {
-                        raw_capacity[cpu] = arch_scale_cpu_capacity(NULL, cpu) *
+                        raw_capacity[cpu] = topology_get_cpu_scale(NULL, cpu) *
                                             policy->cpuinfo.max_freq / 1000UL;
                         capacity_scale = max(raw_capacity[cpu], capacity_scale);
                 }
                 if (cpumask_empty(cpus_to_visit)) {
-                        normalize_cpu_capacity();
+                        topology_normalize_cpu_scale();
                         kfree(raw_capacity);
                         pr_debug("cpu_capacity: parsing done\n");
                         cap_parsing_done = true;