cacheinfo: Align checks in cache_shared_cpu_map_{setup,remove} for readability

The checks to skip the CPU itself or no cacheinfo case are implemented
bit differently though the effect is exactly same. Just align the
implementation in both cache_shared_cpu_map_{setup,remove} just for
improved readability. No functional change.

Link: https://lore.kernel.org/r/20220704101605.1318280-9-sudeep.holla@arm.com
Tested-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index e331b399adeb7eb5049e9712c3d894f0b6d95535..65d566ff24c41ab0bbb13765e1b868bf65d25230 100644 (file)
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -279,6 +279,7 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)
 
                        if (i == cpu || !sib_cpu_ci->info_list)
                                continue;/* skip if itself or no cacheinfo */
+
                        sib_leaf = per_cpu_cacheinfo_idx(i, index);
                        if (cache_leaves_are_shared(this_leaf, sib_leaf)) {
                                cpumask_set_cpu(cpu, &sib_leaf->shared_cpu_map);
@@ -301,14 +302,11 @@ static void cache_shared_cpu_map_remove(unsigned int cpu)
        for (index = 0; index < cache_leaves(cpu); index++) {
                this_leaf = per_cpu_cacheinfo_idx(cpu, index);
                for_each_cpu(sibling, &this_leaf->shared_cpu_map) {
-                       struct cpu_cacheinfo *sib_cpu_ci;
-
-                       if (sibling == cpu) /* skip itself */
-                               continue;
+                       struct cpu_cacheinfo *sib_cpu_ci =
+                                               get_cpu_cacheinfo(sibling);
 
-                       sib_cpu_ci = get_cpu_cacheinfo(sibling);
-                       if (!sib_cpu_ci->info_list)
-                               continue;
+                       if (sibling == cpu || !sib_cpu_ci->info_list)
+                               continue;/* skip if itself or no cacheinfo */
 
                        sib_leaf = per_cpu_cacheinfo_idx(sibling, index);
                        cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);