Commit 087a4ab2 authored by Josh Cartwright's avatar Josh Cartwright Committed by Jason Cooper
Browse files

bus: mvebu-mbus: make use of of_find_matching_node_and_match

Instead of the of_find_matching_node()/of_match_node() pair, which requires two
iterations through the match table, make use of of_find_matching_node_and_match(),
which only iterates through the table once.

Signed-off-by: default avatarJosh Cartwright <>
Signed-off-by: default avatarJason Cooper <>
parent 38dbfb59
...@@ -890,13 +890,12 @@ int __init mvebu_mbus_dt_init(void) ...@@ -890,13 +890,12 @@ int __init mvebu_mbus_dt_init(void)
const __be32 *prop; const __be32 *prop;
int ret; int ret;
np = of_find_matching_node(NULL, of_mvebu_mbus_ids); np = of_find_matching_node_and_match(NULL, of_mvebu_mbus_ids, &of_id);
if (!np) { if (!np) {
pr_err("could not find a matching SoC family\n"); pr_err("could not find a matching SoC family\n");
return -ENODEV; return -ENODEV;
} }
of_id = of_match_node(of_mvebu_mbus_ids, np);
mbus_state.soc = of_id->data; mbus_state.soc = of_id->data;
prop = of_get_property(np, "controller", NULL); prop = of_get_property(np, "controller", NULL);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment