Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stephen Boyd and committed by
Michael Turquette
98d8a60e 497295af

+21 -21
+1 -1
drivers/clk/clk-cdce706.c
··· 310 310 if (!mul) 311 311 div = CDCE706_DIVIDER_DIVIDER_MAX; 312 312 313 - if (__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT) { 313 + if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) { 314 314 unsigned long best_diff = rate; 315 315 unsigned long best_div = 0; 316 316 struct clk *gp_clk = cdce->clkin_clk[cdce->clkin[0].parent];
+1 -1
drivers/clk/clk-composite.c
··· 78 78 mux_hw && mux_ops && mux_ops->set_parent) { 79 79 req->best_parent_hw = NULL; 80 80 81 - if (__clk_get_flags(hw->clk) & CLK_SET_RATE_NO_REPARENT) { 81 + if (clk_hw_get_flags(hw) & CLK_SET_RATE_NO_REPARENT) { 82 82 parent = clk_get_parent(mux_hw->clk); 83 83 req->best_parent_hw = __clk_get_hw(parent); 84 84 req->best_parent_rate = __clk_get_rate(parent);
+1 -1
drivers/clk/clk-divider.c
··· 290 290 291 291 maxdiv = _get_maxdiv(table, width, flags); 292 292 293 - if (!(__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT)) { 293 + if (!(clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)) { 294 294 parent_rate = *best_parent_rate; 295 295 bestdiv = _div_round(table, parent_rate, rate, flags); 296 296 bestdiv = bestdiv == 0 ? 1 : bestdiv;
+1 -1
drivers/clk/clk-fixed-factor.c
··· 41 41 { 42 42 struct clk_fixed_factor *fix = to_clk_fixed_factor(hw); 43 43 44 - if (__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT) { 44 + if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) { 45 45 unsigned long best_parent; 46 46 47 47 best_parent = (rate / fix->mult) * fix->div;
+2 -2
drivers/clk/clk-si5351.c
··· 663 663 divby4 = 1; 664 664 665 665 /* multisync can set pll */ 666 - if (__clk_get_flags(hwdata->hw.clk) & CLK_SET_RATE_PARENT) { 666 + if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) { 667 667 /* 668 668 * find largest integer divider for max 669 669 * vco frequency and given target rate ··· 1013 1013 rate = SI5351_CLKOUT_MIN_FREQ; 1014 1014 1015 1015 /* request frequency if multisync master */ 1016 - if (__clk_get_flags(hwdata->hw.clk) & CLK_SET_RATE_PARENT) { 1016 + if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) { 1017 1017 /* use r divider for frequencies below 1MHz */ 1018 1018 rdiv = SI5351_OUTPUT_CLK_DIV_1; 1019 1019 while (rate < SI5351_MULTISYNTH_MIN_FREQ &&
+1 -1
drivers/clk/clk-stm32f4.c
··· 175 175 if (readl(base + STM32F4_RCC_CFGR) & BIT(am->bit_idx)) 176 176 mult = 2; 177 177 178 - if (__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT) { 178 + if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) { 179 179 unsigned long best_parent = rate / mult; 180 180 181 181 *prate =
+1 -1
drivers/clk/qcom/clk-rcg.c
··· 420 420 if (index < 0) 421 421 return index; 422 422 423 - clk_flags = __clk_get_flags(hw->clk); 423 + clk_flags = clk_hw_get_flags(hw); 424 424 p = clk_get_parent_by_index(hw->clk, index); 425 425 if (clk_flags & CLK_SET_RATE_PARENT) { 426 426 rate = rate * f->pre_div;
+1 -1
drivers/clk/qcom/clk-rcg2.c
··· 192 192 if (index < 0) 193 193 return index; 194 194 195 - clk_flags = __clk_get_flags(hw->clk); 195 + clk_flags = clk_hw_get_flags(hw); 196 196 p = clk_get_parent_by_index(hw->clk, index); 197 197 if (clk_flags & CLK_SET_RATE_PARENT) { 198 198 if (f->pre_div) {
+1 -1
drivers/clk/st/clk-flexgen.c
··· 109 109 /* Round div according to exact prate and wished rate */ 110 110 div = clk_best_div(*prate, rate); 111 111 112 - if (__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT) { 112 + if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) { 113 113 *prate = rate * div; 114 114 return rate; 115 115 }
+1 -1
drivers/clk/sunxi/clk-factors.c
··· 92 92 parent = clk_get_parent_by_index(clk, i); 93 93 if (!parent) 94 94 continue; 95 - if (__clk_get_flags(clk) & CLK_SET_RATE_PARENT) 95 + if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) 96 96 parent_rate = __clk_round_rate(parent, req->rate); 97 97 else 98 98 parent_rate = __clk_get_rate(parent);
+1 -1
drivers/clk/sunxi/clk-sunxi.c
··· 133 133 parent = clk_get_parent_by_index(clk, i); 134 134 if (!parent) 135 135 continue; 136 - if (__clk_get_flags(clk) & CLK_SET_RATE_PARENT) 136 + if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) 137 137 parent_rate = __clk_round_rate(parent, req->rate); 138 138 else 139 139 parent_rate = __clk_get_rate(parent);
+2 -2
drivers/clk/ti/clk.c
··· 339 339 if (!IS_ERR(clk)) { 340 340 setup->clk = clk; 341 341 if (setup->clkdm_name) { 342 - if (__clk_get_flags(clk) & CLK_IS_BASIC) { 342 + clk_hw = __clk_get_hw(clk); 343 + if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) { 343 344 pr_warn("can't setup clkdm for basic clk %s\n", 344 345 setup->name); 345 346 } else { 346 - clk_hw = __clk_get_hw(clk); 347 347 to_clk_hw_omap(clk_hw)->clkdm_name = 348 348 setup->clkdm_name; 349 349 omap2_init_clk_clkdm(clk_hw);
+2 -2
drivers/clk/ti/clockdomain.c
··· 120 120 __func__, node->full_name, i, PTR_ERR(clk)); 121 121 continue; 122 122 } 123 - if (__clk_get_flags(clk) & CLK_IS_BASIC) { 123 + clk_hw = __clk_get_hw(clk); 124 + if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) { 124 125 pr_warn("can't setup clkdm for basic clk %s\n", 125 126 __clk_get_name(clk)); 126 127 continue; 127 128 } 128 - clk_hw = __clk_get_hw(clk); 129 129 to_clk_hw_omap(clk_hw)->clkdm_name = clkdm_name; 130 130 omap2_init_clk_clkdm(clk_hw); 131 131 }
+1 -1
drivers/clk/ti/divider.c
··· 155 155 156 156 maxdiv = _get_maxdiv(divider); 157 157 158 - if (!(__clk_get_flags(hw->clk) & CLK_SET_RATE_PARENT)) { 158 + if (!(clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT)) { 159 159 parent_rate = *best_parent_rate; 160 160 bestdiv = DIV_ROUND_UP(parent_rate, rate); 161 161 bestdiv = bestdiv == 0 ? 1 : bestdiv;
+2 -2
drivers/clk/ti/dpll.c
··· 163 163 clk = clk_register(NULL, &clk_hw->hw); 164 164 165 165 if (!IS_ERR(clk)) { 166 - omap2_init_clk_hw_omap_clocks(clk); 166 + omap2_init_clk_hw_omap_clocks(&clk_hw->hw); 167 167 of_clk_add_provider(node, of_clk_src_simple_get, clk); 168 168 kfree(clk_hw->hw.init->parent_names); 169 169 kfree(clk_hw->hw.init); ··· 320 320 if (IS_ERR(clk)) { 321 321 kfree(clk_hw); 322 322 } else { 323 - omap2_init_clk_hw_omap_clocks(clk); 323 + omap2_init_clk_hw_omap_clocks(&clk_hw->hw); 324 324 of_clk_add_provider(node, of_clk_src_simple_get, clk); 325 325 } 326 326 }
+1 -1
drivers/clk/ti/dpll3xxx.c
··· 711 711 do { 712 712 parent = __clk_get_parent(hw->clk); 713 713 hw = __clk_get_hw(parent); 714 - } while (hw && (__clk_get_flags(hw->clk) & CLK_IS_BASIC)); 714 + } while (hw && (clk_hw_get_flags(hw) & CLK_IS_BASIC)); 715 715 if (!hw) 716 716 break; 717 717 pclk = to_clk_hw_omap(hw);
+1 -1
drivers/clk/ti/interface.c
··· 63 63 if (IS_ERR(clk)) 64 64 kfree(clk_hw); 65 65 else 66 - omap2_init_clk_hw_omap_clocks(clk); 66 + omap2_init_clk_hw_omap_clocks(&clk_hw->hw); 67 67 68 68 return clk; 69 69 }