diff options
| author | Rob Herring <robh@kernel.org> | 2017-05-04 19:30:07 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-05-04 19:58:48 +0200 |
| commit | 91d967497f11dbb5038c7b84bc30dae684ae5ffb (patch) | |
| tree | 88730a0785de8dcce73ae6222e9e2a26c393d4b4 /drivers/of/base.c | |
| parent | of/unittest: Missing unlocks on error (diff) | |
| download | linux-91d967497f11dbb5038c7b84bc30dae684ae5ffb.tar.xz linux-91d967497f11dbb5038c7b84bc30dae684ae5ffb.zip | |
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>
Diffstat (limited to '')
| -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); */ 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. |