diff options
| author | Josh Cartwright <joshc@codeaurora.org> | 2014-02-11 17:24:00 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-11 20:14:42 +0100 |
| commit | 087a4ab272780f52f6ea24b1c0e2e8dd3a220e15 (patch) | |
| tree | c6bed335cc0c70d0c58fa7ac74dfd812c6aef863 /drivers/bus | |
| parent | Linus 3.14-rc1 (diff) | |
| download | linux-087a4ab272780f52f6ea24b1c0e2e8dd3a220e15.tar.xz linux-087a4ab272780f52f6ea24b1c0e2e8dd3a220e15.zip | |
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>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/mvebu-mbus.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index 725c46162bbd..31f2c805d3e5 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c @@ -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); |