Skip to content

Commit 91d9674

Browse files
committed
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>
1 parent 8756cd1 commit 91d9674

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

drivers/of/base.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2250,15 +2250,14 @@ EXPORT_SYMBOL_GPL(of_console_check);
22502250
*/
22512251
struct device_node *of_find_next_cache_node(const struct device_node *np)
22522252
{
2253-
struct device_node *child;
2254-
const phandle *handle;
2253+
struct device_node *child, *cache_node;
22552254

2256-
handle = of_get_property(np, "l2-cache", NULL);
2257-
if (!handle)
2258-
handle = of_get_property(np, "next-level-cache", NULL);
2255+
cache_node = of_parse_phandle(np, "l2-cache", 0);
2256+
if (!cache_node)
2257+
cache_node = of_parse_phandle(np, "next-level-cache", 0);
22592258

2260-
if (handle)
2261-
return of_find_node_by_phandle(be32_to_cpup(handle));
2259+
if (cache_node)
2260+
return cache_node;
22622261

22632262
/* OF on pmac has nodes instead of properties named "l2-cache"
22642263
* beneath CPU nodes.

0 commit comments

Comments
 (0)