ARM: 8462/1: cache-uniphier: use common API to find the next level cache
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 24 Nov 2015 16:01:10 +0000 (17:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Dec 2015 00:03:09 +0000 (00:03 +0000)
The function uniphier_cache_get_next_level_node() does the same thing
as of_find_next_cache_node().  Drop the former and stick to the common
API.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/cache-uniphier.c

index 0502ba17a3aba4288d3cfc778b8f5cba4a32f279..a6fa7b73fbe04a30c2902e8a54fb4019352fb6fc 100644 (file)
@@ -377,17 +377,6 @@ static const struct of_device_id uniphier_cache_match[] __initconst = {
        { /* sentinel */ }
 };
 
-static struct device_node * __init uniphier_cache_get_next_level_node(
-                                                       struct device_node *np)
-{
-       u32 phandle;
-
-       if (of_property_read_u32(np, "next-level-cache", &phandle))
-               return NULL;
-
-       return of_find_node_by_phandle(phandle);
-}
-
 static int __init __uniphier_cache_init(struct device_node *np,
                                        unsigned int *cache_level)
 {
@@ -491,7 +480,7 @@ static int __init __uniphier_cache_init(struct device_node *np,
         * next level cache fails because we want to continue with available
         * cache levels.
         */
-       next_np = uniphier_cache_get_next_level_node(np);
+       next_np = of_find_next_cache_node(np);
        if (next_np) {
                (*cache_level)++;
                ret = __uniphier_cache_init(next_np, cache_level);