diff options
author | Rob Herring <robh@kernel.org> | 2017-05-04 13:30:07 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2017-05-04 13:58:48 -0400 |
commit | 91d967497f11dbb5038c7b84bc30dae684ae5ffb (patch) | |
tree | 88730a0785de8dcce73ae6222e9e2a26c393d4b4 | |
parent | 8756cd1ded1af222fda4470b08ba547f5625e656 (diff) |
of: fix sparse warnings in of_find_next_cache_node
sparse gives a warning that 'handle' is not a __be32:
../drivers/of/base.c:2261:61: warning: incorrect type in argument 1 (different base types)
../drivers/of/base.c:2261:61: expected restricted __be32 const [usertype] *p
../drivers/of/base.c:2261:61: got unsigned int const [usertype] *[assigned] handle
We could just change the type, but the code can be improved by using
of_parse_phandle instead of open coding it with of_get_property and
of_find_node_by_phandle.
Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r-- | drivers/of/base.c | 13 |
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); | |||
2250 | */ | 2250 | */ |
2251 | struct device_node *of_find_next_cache_node(const struct device_node *np) | 2251 | struct device_node *of_find_next_cache_node(const struct device_node *np) |
2252 | { | 2252 | { |
2253 | struct device_node *child; | 2253 | struct device_node *child, *cache_node; |
2254 | const phandle *handle; | ||
2255 | 2254 | ||
2256 | handle = of_get_property(np, "l2-cache", NULL); | 2255 | cache_node = of_parse_phandle(np, "l2-cache", 0); |
2257 | if (!handle) | 2256 | if (!cache_node) |
2258 | handle = of_get_property(np, "next-level-cache", NULL); | 2257 | cache_node = of_parse_phandle(np, "next-level-cache", 0); |
2259 | 2258 | ||
2260 | if (handle) | 2259 | if (cache_node) |
2261 | return of_find_node_by_phandle(be32_to_cpup(handle)); | 2260 | return cache_node; |
2262 | 2261 | ||
2263 | /* OF on pmac has nodes instead of properties named "l2-cache" | 2262 | /* OF on pmac has nodes instead of properties named "l2-cache" |
2264 | * beneath CPU nodes. | 2263 | * beneath CPU nodes. |