5 files changed, 35 insertions, 35 deletions

diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
index dee81b83c4b3..956b7e54fa1c 100644
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
@@ -27,7 +27,7 @@ static u8 clk_composite_get_parent(struct clk_hw *hw)
         const struct clk_ops *mux_ops = composite->mux_ops;
         struct clk_hw *mux_hw = composite->mux_hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         return mux_ops->get_parent(mux_hw);
 }
@@ -38,7 +38,7 @@ static int clk_composite_set_parent(struct clk_hw *hw, u8 index)
         const struct clk_ops *mux_ops = composite->mux_ops;
         struct clk_hw *mux_hw = composite->mux_hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         return mux_ops->set_parent(mux_hw, index);
 }
@@ -50,7 +50,7 @@ static unsigned long clk_composite_recalc_rate(struct clk_hw *hw,
         const struct clk_ops *rate_ops = composite->rate_ops;
         struct clk_hw *rate_hw = composite->rate_hw;
 
-        rate_hw->clk = hw->clk;
+        __clk_hw_set_clk(rate_hw, hw);
 
         return rate_ops->recalc_rate(rate_hw, parent_rate);
 }
@@ -74,7 +74,7 @@ static long clk_composite_determine_rate(struct clk_hw *hw, unsigned long rate,
         int i;
 
         if (rate_hw && rate_ops && rate_ops->determine_rate) {
-                rate_hw->clk = hw->clk;
+                __clk_hw_set_clk(rate_hw, hw);
                 return rate_ops->determine_rate(rate_hw, rate, min_rate,
                                                 max_rate,
                                                 best_parent_rate,
@@ -120,7 +120,7 @@ static long clk_composite_determine_rate(struct clk_hw *hw, unsigned long rate,
 
                 return best_rate;
         } else if (mux_hw && mux_ops && mux_ops->determine_rate) {
-                mux_hw->clk = hw->clk;
+                __clk_hw_set_clk(mux_hw, hw);
                 return mux_ops->determine_rate(mux_hw, rate, min_rate,
                                                max_rate, best_parent_rate,
                                                best_parent_p);
@@ -137,7 +137,7 @@ static long clk_composite_round_rate(struct clk_hw *hw, unsigned long rate,
         const struct clk_ops *rate_ops = composite->rate_ops;
         struct clk_hw *rate_hw = composite->rate_hw;
 
-        rate_hw->clk = hw->clk;
+        __clk_hw_set_clk(rate_hw, hw);
 
         return rate_ops->round_rate(rate_hw, rate, prate);
 }
@@ -149,7 +149,7 @@ static int clk_composite_set_rate(struct clk_hw *hw, unsigned long rate,
         const struct clk_ops *rate_ops = composite->rate_ops;
         struct clk_hw *rate_hw = composite->rate_hw;
 
-        rate_hw->clk = hw->clk;
+        __clk_hw_set_clk(rate_hw, hw);
 
         return rate_ops->set_rate(rate_hw, rate, parent_rate);
 }
@@ -160,7 +160,7 @@ static int clk_composite_is_enabled(struct clk_hw *hw)
         const struct clk_ops *gate_ops = composite->gate_ops;
         struct clk_hw *gate_hw = composite->gate_hw;
 
-        gate_hw->clk = hw->clk;
+        __clk_hw_set_clk(gate_hw, hw);
 
         return gate_ops->is_enabled(gate_hw);
 }
@@ -171,7 +171,7 @@ static int clk_composite_enable(struct clk_hw *hw)
         const struct clk_ops *gate_ops = composite->gate_ops;
         struct clk_hw *gate_hw = composite->gate_hw;
 
-        gate_hw->clk = hw->clk;
+        __clk_hw_set_clk(gate_hw, hw);
 
         return gate_ops->enable(gate_hw);
 }
@@ -182,7 +182,7 @@ static void clk_composite_disable(struct clk_hw *hw)
         const struct clk_ops *gate_ops = composite->gate_ops;
         struct clk_hw *gate_hw = composite->gate_hw;
 
-        gate_hw->clk = hw->clk;
+        __clk_hw_set_clk(gate_hw, hw);
 
         gate_ops->disable(gate_hw);
 }
diff --git a/drivers/clk/pxa/clk-pxa.c b/drivers/clk/pxa/clk-pxa.c
index 4e834753ab09..29cee9e8d4d9 100644
--- a/drivers/clk/pxa/clk-pxa.c
+++ b/drivers/clk/pxa/clk-pxa.c
@@ -46,7 +46,7 @@ static unsigned long cken_recalc_rate(struct clk_hw *hw,
                 fix = &pclk->lp;
         else
                 fix = &pclk->hp;
-        fix->hw.clk = hw->clk;
+        __clk_hw_set_clk(&fix->hw, hw);
         return clk_fixed_factor_ops.recalc_rate(&fix->hw, parent_rate);
 }
 
diff --git a/drivers/clk/st/clk-flexgen.c b/drivers/clk/st/clk-flexgen.c
index 3a484b3cb448..bf12a25eb3a2 100644
--- a/drivers/clk/st/clk-flexgen.c
+++ b/drivers/clk/st/clk-flexgen.c
@@ -37,8 +37,8 @@ static int flexgen_enable(struct clk_hw *hw)
         struct clk_hw *pgate_hw = &flexgen->pgate.hw;
         struct clk_hw *fgate_hw = &flexgen->fgate.hw;
 
-        pgate_hw->clk = hw->clk;
-        fgate_hw->clk = hw->clk;
+        __clk_hw_set_clk(pgate_hw, hw);
+        __clk_hw_set_clk(fgate_hw, hw);
 
         clk_gate_ops.enable(pgate_hw);
 
@@ -54,7 +54,7 @@ static void flexgen_disable(struct clk_hw *hw)
         struct clk_hw *fgate_hw = &flexgen->fgate.hw;
 
         /* disable only the final gate */
-        fgate_hw->clk = hw->clk;
+        __clk_hw_set_clk(fgate_hw, hw);
 
         clk_gate_ops.disable(fgate_hw);
 
@@ -66,7 +66,7 @@ static int flexgen_is_enabled(struct clk_hw *hw)
         struct flexgen *flexgen = to_flexgen(hw);
         struct clk_hw *fgate_hw = &flexgen->fgate.hw;
 
-        fgate_hw->clk = hw->clk;
+        __clk_hw_set_clk(fgate_hw, hw);
 
         if (!clk_gate_ops.is_enabled(fgate_hw))
                 return 0;
@@ -79,7 +79,7 @@ static u8 flexgen_get_parent(struct clk_hw *hw)
         struct flexgen *flexgen = to_flexgen(hw);
         struct clk_hw *mux_hw = &flexgen->mux.hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         return clk_mux_ops.get_parent(mux_hw);
 }
@@ -89,7 +89,7 @@ static int flexgen_set_parent(struct clk_hw *hw, u8 index)
         struct flexgen *flexgen = to_flexgen(hw);
         struct clk_hw *mux_hw = &flexgen->mux.hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         return clk_mux_ops.set_parent(mux_hw, index);
 }
@@ -124,8 +124,8 @@ unsigned long flexgen_recalc_rate(struct clk_hw *hw,
         struct clk_hw *fdiv_hw = &flexgen->fdiv.hw;
         unsigned long mid_rate;
 
-        pdiv_hw->clk = hw->clk;
-        fdiv_hw->clk = hw->clk;
+        __clk_hw_set_clk(pdiv_hw, hw);
+        __clk_hw_set_clk(fdiv_hw, hw);
 
         mid_rate = clk_divider_ops.recalc_rate(pdiv_hw, parent_rate);
 
@@ -141,8 +141,8 @@ static int flexgen_set_rate(struct clk_hw *hw, unsigned long rate,
         unsigned long div = 0;
         int ret = 0;
 
-        pdiv_hw->clk = hw->clk;
-        fdiv_hw->clk = hw->clk;
+        __clk_hw_set_clk(pdiv_hw, hw);
+        __clk_hw_set_clk(fdiv_hw, hw);
 
         div = clk_best_div(parent_rate, rate);
 
diff --git a/drivers/clk/st/clkgen-mux.c b/drivers/clk/st/clkgen-mux.c
index 79dc40b5cc68..9a15ec344a85 100644
--- a/drivers/clk/st/clkgen-mux.c
+++ b/drivers/clk/st/clkgen-mux.c
@@ -94,7 +94,7 @@ static int clkgena_divmux_enable(struct clk_hw *hw)
         unsigned long timeout;
         int ret = 0;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         ret = clk_mux_ops.set_parent(mux_hw, genamux->muxsel);
         if (ret)
@@ -116,7 +116,7 @@ static void clkgena_divmux_disable(struct clk_hw *hw)
         struct clkgena_divmux *genamux = to_clkgena_divmux(hw);
         struct clk_hw *mux_hw = &genamux->mux.hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         clk_mux_ops.set_parent(mux_hw, CKGAX_CLKOPSRC_SWITCH_OFF);
 }
@@ -126,7 +126,7 @@ static int clkgena_divmux_is_enabled(struct clk_hw *hw)
         struct clkgena_divmux *genamux = to_clkgena_divmux(hw);
         struct clk_hw *mux_hw = &genamux->mux.hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         return (s8)clk_mux_ops.get_parent(mux_hw) > 0;
 }
@@ -136,7 +136,7 @@ u8 clkgena_divmux_get_parent(struct clk_hw *hw)
         struct clkgena_divmux *genamux = to_clkgena_divmux(hw);
         struct clk_hw *mux_hw = &genamux->mux.hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         genamux->muxsel = clk_mux_ops.get_parent(mux_hw);
         if ((s8)genamux->muxsel < 0) {
@@ -174,7 +174,7 @@ unsigned long clkgena_divmux_recalc_rate(struct clk_hw *hw,
         struct clkgena_divmux *genamux = to_clkgena_divmux(hw);
         struct clk_hw *div_hw = &genamux->div[genamux->muxsel].hw;
 
-        div_hw->clk = hw->clk;
+        __clk_hw_set_clk(div_hw, hw);
 
         return clk_divider_ops.recalc_rate(div_hw, parent_rate);
 }
@@ -185,7 +185,7 @@ static int clkgena_divmux_set_rate(struct clk_hw *hw, unsigned long rate,
         struct clkgena_divmux *genamux = to_clkgena_divmux(hw);
         struct clk_hw *div_hw = &genamux->div[genamux->muxsel].hw;
 
-        div_hw->clk = hw->clk;
+        __clk_hw_set_clk(div_hw, hw);
 
         return clk_divider_ops.set_rate(div_hw, rate, parent_rate);
 }
@@ -196,7 +196,7 @@ static long clkgena_divmux_round_rate(struct clk_hw *hw, unsigned long rate,
         struct clkgena_divmux *genamux = to_clkgena_divmux(hw);
         struct clk_hw *div_hw = &genamux->div[genamux->muxsel].hw;
 
-        div_hw->clk = hw->clk;
+        __clk_hw_set_clk(div_hw, hw);
 
         return clk_divider_ops.round_rate(div_hw, rate, prate);
 }
diff --git a/drivers/clk/tegra/clk-periph.c b/drivers/clk/tegra/clk-periph.c
index 9e899c18af86..d84ae49d0e05 100644
--- a/drivers/clk/tegra/clk-periph.c
+++ b/drivers/clk/tegra/clk-periph.c
@@ -28,7 +28,7 @@ static u8 clk_periph_get_parent(struct clk_hw *hw)
         const struct clk_ops *mux_ops = periph->mux_ops;
         struct clk_hw *mux_hw = &periph->mux.hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         return mux_ops->get_parent(mux_hw);
 }
@@ -39,7 +39,7 @@ static int clk_periph_set_parent(struct clk_hw *hw, u8 index)
         const struct clk_ops *mux_ops = periph->mux_ops;
         struct clk_hw *mux_hw = &periph->mux.hw;
 
-        mux_hw->clk = hw->clk;
+        __clk_hw_set_clk(mux_hw, hw);
 
         return mux_ops->set_parent(mux_hw, index);
 }
@@ -51,7 +51,7 @@ static unsigned long clk_periph_recalc_rate(struct clk_hw *hw,
         const struct clk_ops *div_ops = periph->div_ops;
         struct clk_hw *div_hw = &periph->divider.hw;
 
-        div_hw->clk = hw->clk;
+        __clk_hw_set_clk(div_hw, hw);
 
         return div_ops->recalc_rate(div_hw, parent_rate);
 }
@@ -63,7 +63,7 @@ static long clk_periph_round_rate(struct clk_hw *hw, unsigned long rate,
         const struct clk_ops *div_ops = periph->div_ops;
         struct clk_hw *div_hw = &periph->divider.hw;
 
-        div_hw->clk = hw->clk;
+        __clk_hw_set_clk(div_hw, hw);
 
         return div_ops->round_rate(div_hw, rate, prate);
 }
@@ -75,7 +75,7 @@ static int clk_periph_set_rate(struct clk_hw *hw, unsigned long rate,
         const struct clk_ops *div_ops = periph->div_ops;
         struct clk_hw *div_hw = &periph->divider.hw;
 
-        div_hw->clk = hw->clk;
+        __clk_hw_set_clk(div_hw, hw);
 
         return div_ops->set_rate(div_hw, rate, parent_rate);
 }
@@ -86,7 +86,7 @@ static int clk_periph_is_enabled(struct clk_hw *hw)
         const struct clk_ops *gate_ops = periph->gate_ops;
         struct clk_hw *gate_hw = &periph->gate.hw;
 
-        gate_hw->clk = hw->clk;
+        __clk_hw_set_clk(gate_hw, hw);
 
         return gate_ops->is_enabled(gate_hw);
 }
@@ -97,7 +97,7 @@ static int clk_periph_enable(struct clk_hw *hw)
         const struct clk_ops *gate_ops = periph->gate_ops;
         struct clk_hw *gate_hw = &periph->gate.hw;
 
-        gate_hw->clk = hw->clk;
+        __clk_hw_set_clk(gate_hw, hw);
 
         return gate_ops->enable(gate_hw);
 }