Commit 087a4ab2 authored Feb 11, 2014 by Josh Cartwright Committed by Jason Cooper Feb 11, 2014

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: Josh Cartwright <joshc@codeaurora.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

parent 38dbfb59

drivers/bus/mvebu-mbus.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -890,13 +890,12 @@ int __init mvebu_mbus_dt_init(void)
		const __be32 *prop;
		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) {
		pr_err("could not find a matching SoC family\n");
		return -ENODEV;
		}

		of_id = of_match_node(of_mvebu_mbus_ids, np);
		mbus_state.soc = of_id->data;

		prop = of_get_property(np, "controller", NULL);