diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-11-24 11:01:10 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-12-02 19:03:09 -0500 |
commit | 89e69fbfd18bf4ec9ce2663bcb35342aa8a2b3af (patch) | |
tree | bdf6ddd9bc6f439ab8b43c62b2fa20a3fb3b31fa | |
parent | 6c044fecdf78be3fda159a5036bb33700cdd5e59 (diff) |
ARM: 8462/1: cache-uniphier: use common API to find the next level cache
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>
-rw-r--r-- | arch/arm/mm/cache-uniphier.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mm/cache-uniphier.c b/arch/arm/mm/cache-uniphier.c index 0502ba17a3ab..a6fa7b73fbe0 100644 --- a/arch/arm/mm/cache-uniphier.c +++ b/arch/arm/mm/cache-uniphier.c | |||
@@ -377,17 +377,6 @@ static const struct of_device_id uniphier_cache_match[] __initconst = { | |||
377 | { /* sentinel */ } | 377 | { /* sentinel */ } |
378 | }; | 378 | }; |
379 | 379 | ||
380 | static struct device_node * __init uniphier_cache_get_next_level_node( | ||
381 | struct device_node *np) | ||
382 | { | ||
383 | u32 phandle; | ||
384 | |||
385 | if (of_property_read_u32(np, "next-level-cache", &phandle)) | ||
386 | return NULL; | ||
387 | |||
388 | return of_find_node_by_phandle(phandle); | ||
389 | } | ||
390 | |||
391 | static int __init __uniphier_cache_init(struct device_node *np, | 380 | static int __init __uniphier_cache_init(struct device_node *np, |
392 | unsigned int *cache_level) | 381 | unsigned int *cache_level) |
393 | { | 382 | { |
@@ -491,7 +480,7 @@ static int __init __uniphier_cache_init(struct device_node *np, | |||
491 | * next level cache fails because we want to continue with available | 480 | * next level cache fails because we want to continue with available |
492 | * cache levels. | 481 | * cache levels. |
493 | */ | 482 | */ |
494 | next_np = uniphier_cache_get_next_level_node(np); | 483 | next_np = of_find_next_cache_node(np); |
495 | if (next_np) { | 484 | if (next_np) { |
496 | (*cache_level)++; | 485 | (*cache_level)++; |
497 | ret = __uniphier_cache_init(next_np, cache_level); | 486 | ret = __uniphier_cache_init(next_np, cache_level); |