clk: Convert __clk_get_flags() to clk_hw_get_flags()
Mostly converted with the following snippet: @@ struct clk_hw *E; @@ -__clk_get_flags(E->clk) +clk_hw_get_flags(E) Acked-by: Tero Kristo <t-kristo@ti.com> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Max Filippov <jcmvbkbc@gmail.com> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: Daniel Thompson <daniel.thompson@linaro.org> Cc: Coquelin <mcoquelin.stm32@gmail.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:

committed by
Michael Turquette

vanhempi
497295afb5
commit
98d8a60ecc
@@ -339,11 +339,11 @@ struct clk __init *ti_clk_register_clk(struct ti_clk *setup)
|
||||
if (!IS_ERR(clk)) {
|
||||
setup->clk = clk;
|
||||
if (setup->clkdm_name) {
|
||||
if (__clk_get_flags(clk) & CLK_IS_BASIC) {
|
||||
clk_hw = __clk_get_hw(clk);
|
||||
if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) {
|
||||
pr_warn("can't setup clkdm for basic clk %s\n",
|
||||
setup->name);
|
||||
} else {
|
||||
clk_hw = __clk_get_hw(clk);
|
||||
to_clk_hw_omap(clk_hw)->clkdm_name =
|
||||
setup->clkdm_name;
|
||||
omap2_init_clk_clkdm(clk_hw);
|
||||
|
@@ -120,12 +120,12 @@ static void __init of_ti_clockdomain_setup(struct device_node *node)
|
||||
__func__, node->full_name, i, PTR_ERR(clk));
|
||||
continue;
|
||||
}
|
||||
if (__clk_get_flags(clk) & CLK_IS_BASIC) {
|
||||
clk_hw = __clk_get_hw(clk);
|
||||
if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) {
|
||||
pr_warn("can't setup clkdm for basic clk %s\n",
|
||||
__clk_get_name(clk));
|
||||
continue;
|
||||
}
|
||||
clk_hw = __clk_get_hw(clk);
|
||||
to_clk_hw_omap(clk_hw)->clkdm_name = clkdm_name;
|
||||
omap2_init_clk_clkdm(clk_hw);
|
||||
}
|
||||
|
@@ -155,7 +155,7 @@ static int ti_clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate,
|
||||
|
||||
maxdiv = _get_maxdiv(divider);
|
||||
|
||||
if (!(__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT)) {
|
||||
if (!(clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)) {
|
||||
parent_rate = *best_parent_rate;
|
||||
bestdiv = DIV_ROUND_UP(parent_rate, rate);
|
||||
bestdiv = bestdiv == 0 ? 1 : bestdiv;
|
||||
|
@@ -163,7 +163,7 @@ static void __init _register_dpll(struct clk_hw *hw,
|
||||
clk = clk_register(NULL, &clk_hw->hw);
|
||||
|
||||
if (!IS_ERR(clk)) {
|
||||
omap2_init_clk_hw_omap_clocks(clk);
|
||||
omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
|
||||
of_clk_add_provider(node, of_clk_src_simple_get, clk);
|
||||
kfree(clk_hw->hw.init->parent_names);
|
||||
kfree(clk_hw->hw.init);
|
||||
@@ -320,7 +320,7 @@ static void _register_dpll_x2(struct device_node *node,
|
||||
if (IS_ERR(clk)) {
|
||||
kfree(clk_hw);
|
||||
} else {
|
||||
omap2_init_clk_hw_omap_clocks(clk);
|
||||
omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
|
||||
of_clk_add_provider(node, of_clk_src_simple_get, clk);
|
||||
}
|
||||
}
|
||||
|
@@ -711,7 +711,7 @@ static struct clk_hw_omap *omap3_find_clkoutx2_dpll(struct clk_hw *hw)
|
||||
do {
|
||||
parent = __clk_get_parent(hw->clk);
|
||||
hw = __clk_get_hw(parent);
|
||||
} while (hw && (__clk_get_flags(hw->clk) & CLK_IS_BASIC));
|
||||
} while (hw && (clk_hw_get_flags(hw) & CLK_IS_BASIC));
|
||||
if (!hw)
|
||||
break;
|
||||
pclk = to_clk_hw_omap(hw);
|
||||
|
@@ -63,7 +63,7 @@ static struct clk *_register_interface(struct device *dev, const char *name,
|
||||
if (IS_ERR(clk))
|
||||
kfree(clk_hw);
|
||||
else
|
||||
omap2_init_clk_hw_omap_clocks(clk);
|
||||
omap2_init_clk_hw_omap_clocks(&clk_hw->hw);
|
||||
|
||||
return clk;
|
||||
}
|
||||
|
Viittaa uudesa ongelmassa
Block a user