1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index d7c4629a3a2d..016f9d77d64d 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2250,15 +2250,14 @@ EXPORT_SYMBOL_GPL(of_console_check);
  */
 struct device_node *of_find_next_cache_node(const struct device_node *np)
 {
-        struct device_node *child;
-        const phandle *handle;
+        struct device_node *child, *cache_node;
 
-        handle = of_get_property(np, "l2-cache", NULL);
-        if (!handle)
-                handle = of_get_property(np, "next-level-cache", NULL);
+        cache_node = of_parse_phandle(np, "l2-cache", 0);
+        if (!cache_node)
+                cache_node = of_parse_phandle(np, "next-level-cache", 0);
 
-        if (handle)
-                return of_find_node_by_phandle(be32_to_cpup(handle));
+        if (cache_node)
+                return cache_node;
 
         /* OF on pmac has nodes instead of properties named "l2-cache"
          * beneath CPU nodes.