Merge remote-tracking branch 'clk/clk-next'

[deliverable/linux.git] / drivers / clk / bcm / clk-kona.c

diff --git a/drivers/clk/bcm/clk-kona.c b/drivers/clk/bcm/clk-kona.c
index 3a15347b423348b83a70613ad5e6b880d05f8875..eee64b9e5d10b497d8362acbb92ad8312c9ce4f5 100644 (file)
--- a/drivers/clk/bcm/clk-kona.c
+++ b/drivers/clk/bcm/clk-kona.c
@@ -1256,19 +1256,18 @@ bool __init kona_ccu_init(struct ccu_data *ccu)
 {
        unsigned long flags;
        unsigned int which;
-       struct clk **clks = ccu->clk_data.clks;
        struct kona_clk *kona_clks = ccu->kona_clks;
        bool success = true;
 
        flags = ccu_lock(ccu);
        __ccu_write_enable(ccu);
 
-       for (which = 0; which < ccu->clk_data.clk_num; which++) {
-               struct kona_clk *bcm_clk;
+       for (which = 0; which < ccu->clk_num; which++) {
+               struct kona_clk *bcm_clk = &kona_clks[which];
 
-               if (!clks[which])
+               if (!bcm_clk->ccu)
                        continue;
-               bcm_clk = &kona_clks[which];
+
                success &= __kona_clk_init(bcm_clk);
        }