cacheinfo: rename of_node to fw_token

[mirror_ubuntu-bionic-kernel.git] / drivers / base / cacheinfo.c

diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index 5b6af200f06ac655ef9499ffc5b35b0e1beecb88..187099ab318b59460409ba01f257f0a23666fb56 100644 (file)
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -46,7 +46,7 @@ struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu)
 static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf,
                                           struct cacheinfo *sib_leaf)
 {
-       return sib_leaf->of_node == this_leaf->of_node;
+       return sib_leaf->fw_token == this_leaf->fw_token;
 }
 
 /* OF properties to query for a given cache type */
@@ -178,9 +178,10 @@ static int cache_setup_of_node(unsigned int cpu)
        struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
        unsigned int index = 0;
 
-       /* skip if of_node is already populated */
-       if (this_cpu_ci->info_list->of_node)
+       /* skip if fw_token is already populated */
+       if (this_cpu_ci->info_list->fw_token) {
                return 0;
+       }
 
        if (!cpu_dev) {
                pr_err("No cpu device for CPU %d\n", cpu);
@@ -201,7 +202,7 @@ static int cache_setup_of_node(unsigned int cpu)
                if (!np)
                        break;
                cache_of_set_props(this_leaf, np);
-               this_leaf->of_node = np;
+               this_leaf->fw_token = np;
                index++;
        }
 
@@ -289,7 +290,7 @@ static void cache_shared_cpu_map_remove(unsigned int cpu)
                        cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);
                        cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);
                }
-               of_node_put(this_leaf->of_node);
+               of_node_put(this_leaf->fw_token);
        }
 }
 
@@ -334,8 +335,9 @@ static int detect_cache_attributes(unsigned int cpu)
        if (ret)
                goto free_ci;
        /*
-        * For systems using DT for cache hierarchy, of_node and shared_cpu_map
-        * will be set up here only if they are not populated already
+        * For systems using DT for cache hierarchy, fw_token
+        * and shared_cpu_map will be set up here only if they are
+        * not populated already
         */
        ret = cache_shared_cpu_map_setup(cpu);
        if (ret) {