arm64: topology: Remove cluster_to_logical_mask()

It's not used in the current code.

Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h
index 611edefaeaf195a8de5fa74d283d0f45f254bef2..58b8b84adcd2cf5f295e6869b68350f9dcadc798 100644 (file)
--- a/arch/arm64/include/asm/topology.h
+++ b/arch/arm64/include/asm/topology.h
@@ -26,14 +26,11 @@ extern struct cputopo_arm cpu_topology[NR_CPUS];
 void init_cpu_topology(void);
 void store_cpu_topology(unsigned int cpuid);
 const struct cpumask *cpu_coregroup_mask(int cpu);
-int cluster_to_logical_mask(unsigned int socket_id, cpumask_t *cluster_mask);
 
 #else
 
 static inline void init_cpu_topology(void) { }
 static inline void store_cpu_topology(unsigned int cpuid) { }
-static inline int cluster_to_logical_mask(unsigned int socket_id,
-       cpumask_t *cluster_mask) { return -EINVAL; }
 
 #endif
 

diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index 83d6919d4e0a4c1352eb841e8c660a5701570a51..8828e0bfc328b8f87123398caf5dbe826a3598e0 100644 (file)
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -363,35 +363,6 @@ void store_cpu_topology(unsigned int cpuid)
        update_cpu_power(cpuid);
 }
 
-
-/*
- * cluster_to_logical_mask - return cpu logical mask of CPUs in a cluster
- * @socket_id:         cluster HW identifier
- * @cluster_mask:      the cpumask location to be initialized, modified by the
- *                     function only if return value == 0
- *
- * Return:
- *
- * 0 on success
- * -EINVAL if cluster_mask is NULL or there is no record matching socket_id
- */
-int cluster_to_logical_mask(unsigned int socket_id, cpumask_t *cluster_mask)
-{
-       int cpu;
-
-       if (!cluster_mask)
-               return -EINVAL;
-
-       for_each_online_cpu(cpu) {
-               if (socket_id == topology_physical_package_id(cpu)) {
-                       cpumask_copy(cluster_mask, topology_core_cpumask(cpu));
-                       return 0;
-               }
-       }
-
-       return -EINVAL;
-}
-
 /*
  * init_cpu_topology is called at boot when only one cpu is running
  * which prevent simultaneous write access to cpu_topology array