ARM: mvebu: 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.

While we're here, mark the of_system_controller table const.

Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

1 files changed, 4 insertions, 5 deletions

diff --git a/arch/arm/mach-mvebu/system-controller.c b/arch/arm/mach-mvebu/system-controller.c
index a7fb89a5b5d9..e6e300afe836 100644
--- a/arch/arm/mach-mvebu/system-controller.c
+++ b/arch/arm/mach-mvebu/system-controller.c
@@ -54,7 +54,7 @@ static const struct mvebu_system_controller orion_system_controller = {
         .system_soft_reset = 0x1,
 };
 
-static struct of_device_id of_system_controller_table[] = {
+static const struct of_device_id of_system_controller_table[] = {
         {
                 .compatible = "marvell,orion-system-controller",
                 .data = (void *) &orion_system_controller,
@@ -90,13 +90,12 @@ void mvebu_restart(enum reboot_mode mode, const char *cmd)
 
 static int __init mvebu_system_controller_init(void)
 {
+        const struct of_device_id *match;
         struct device_node *np;
 
-        np = of_find_matching_node(NULL, of_system_controller_table);
+        np = of_find_matching_node_and_match(NULL, of_system_controller_table,
+                                             &match);
         if (np) {
-                const struct of_device_id *match =
-                    of_match_node(of_system_controller_table, np);
-                BUG_ON(!match);
                 system_controller_base = of_iomap(np, 0);
                 mvebu_sc = (struct mvebu_system_controller *)match->data;
                 of_node_put(np);