Merge tag 'blackfin-for-linus' of http://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / clk / sunxi / clk-sunxi.c

diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 4cc2b2a5aa752241de24487ec8c446ca2ceefda0..426483422d3d50edb20c3f013668cdacff9bd6d8 100644 (file)
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -1315,8 +1315,7 @@ static void __init of_sunxi_table_clock_setup(const struct of_device_id *clk_mat
        const struct of_device_id *match;
        void (*setup_function)(struct device_node *, const void *) = function;
 
-       for_each_matching_node(np, clk_match) {
-               match = of_match_node(clk_match, np);
+       for_each_matching_node_and_match(np, clk_match, &match) {
                data = match->data;
                setup_function(np, data);
        }
@@ -1347,7 +1346,7 @@ static void __init sunxi_clock_protect(void)
        }
 }
 
-static void __init sunxi_init_clocks(void)
+static void __init sunxi_init_clocks(struct device_node *np)
 {
        /* Register factor clocks */
        of_sunxi_table_clock_setup(clk_factors_match, sunxi_factors_clk_setup);