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

clk: Replace __clk_get_num_parents with clk_hw_get_num_parents()

Mostly converted with the following semantic patch:

@@
struct clk_hw *E;
@@

-__clk_get_num_parents(E->clk)
+clk_hw_get_num_parents(E)

Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Chao Xie <chao.xie@marvell.com>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: "Emilio López" <emilio@elopez.com.ar>
Acked-by: Tero Kristo <t-kristo@ti.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

authored by

Stephen Boyd and committed by
Michael Turquette
497295af 1a9c069c

+20 -20
+1 -1
drivers/clk/at91/clk-programmable.c
··· 64 64 int shift; 65 65 int i; 66 66 67 - for (i = 0; i < __clk_get_num_parents(hw->clk); i++) { 67 + for (i = 0; i < clk_hw_get_num_parents(hw); i++) { 68 68 parent = clk_get_parent_by_index(hw->clk, i); 69 69 if (!parent) 70 70 continue;
+1 -1
drivers/clk/at91/clk-usb.c
··· 66 66 int tmp_diff; 67 67 int i; 68 68 69 - for (i = 0; i < __clk_get_num_parents(hw->clk); i++) { 69 + for (i = 0; i < clk_hw_get_num_parents(hw); i++) { 70 70 int div; 71 71 72 72 parent = clk_get_parent_by_index(hw->clk, i);
+1 -1
drivers/clk/clk-composite.c
··· 92 92 return 0; 93 93 } 94 94 95 - for (i = 0; i < __clk_get_num_parents(mux_hw->clk); i++) { 95 + for (i = 0; i < clk_hw_get_num_parents(mux_hw); i++) { 96 96 parent = clk_get_parent_by_index(mux_hw->clk, i); 97 97 if (!parent) 98 98 continue;
+1 -1
drivers/clk/clk-mux.c
··· 31 31 static u8 clk_mux_get_parent(struct clk_hw *hw) 32 32 { 33 33 struct clk_mux *mux = to_clk_mux(hw); 34 - int num_parents = __clk_get_num_parents(hw->clk); 34 + int num_parents = clk_hw_get_num_parents(hw); 35 35 u32 val; 36 36 37 37 /*
+4 -4
drivers/clk/mmp/clk-mix.c
··· 63 63 64 64 static unsigned int _get_mux(struct mmp_clk_mix *mix, unsigned int val) 65 65 { 66 - int num_parents = __clk_get_num_parents(mix->hw.clk); 66 + int num_parents = clk_hw_get_num_parents(&mix->hw); 67 67 int i; 68 68 69 69 if (mix->mux_flags & CLK_MUX_INDEX_BIT) ··· 241 241 } 242 242 } 243 243 } else { 244 - for (i = 0; i < __clk_get_num_parents(mix_clk); i++) { 244 + for (i = 0; i < clk_hw_get_num_parents(hw); i++) { 245 245 parent = clk_get_parent_by_index(mix_clk, i); 246 246 parent_rate = __clk_get_rate(parent); 247 247 div_val_max = _get_maxdiv(mix); ··· 408 408 else 409 409 return -EINVAL; 410 410 } else { 411 - for (i = 0; i < __clk_get_num_parents(mix_clk); i++) { 411 + for (i = 0; i < clk_hw_get_num_parents(hw); i++) { 412 412 parent = clk_get_parent_by_index(mix_clk, i); 413 413 parent_rate = __clk_get_rate(parent); 414 414 if (parent_rate == best_parent_rate) 415 415 break; 416 416 } 417 - if (i < __clk_get_num_parents(mix_clk)) 417 + if (i < clk_hw_get_num_parents(hw)) 418 418 return _set_rate(mix, _get_mux_val(mix, i), 419 419 _get_div_val(mix, best_divisor), 1, 1); 420 420 else
+2 -2
drivers/clk/qcom/clk-rcg.c
··· 45 45 static u8 clk_rcg_get_parent(struct clk_hw *hw) 46 46 { 47 47 struct clk_rcg *rcg = to_clk_rcg(hw); 48 - int num_parents = __clk_get_num_parents(hw->clk); 48 + int num_parents = clk_hw_get_num_parents(hw); 49 49 u32 ns; 50 50 int i, ret; 51 51 ··· 72 72 static u8 clk_dyn_rcg_get_parent(struct clk_hw *hw) 73 73 { 74 74 struct clk_dyn_rcg *rcg = to_clk_dyn_rcg(hw); 75 - int num_parents = __clk_get_num_parents(hw->clk); 75 + int num_parents = clk_hw_get_num_parents(hw); 76 76 u32 ns, reg; 77 77 int bank; 78 78 int i, ret;
+1 -1
drivers/clk/qcom/clk-rcg2.c
··· 63 63 static u8 clk_rcg2_get_parent(struct clk_hw *hw) 64 64 { 65 65 struct clk_rcg2 *rcg = to_clk_rcg2(hw); 66 - int num_parents = __clk_get_num_parents(hw->clk); 66 + int num_parents = clk_hw_get_num_parents(hw); 67 67 u32 cfg; 68 68 int i, ret; 69 69
+1 -1
drivers/clk/qcom/common.c
··· 46 46 47 47 int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map, u8 src) 48 48 { 49 - int i, num_parents = __clk_get_num_parents(hw->clk); 49 + int i, num_parents = clk_hw_get_num_parents(hw); 50 50 51 51 for (i = 0; i < num_parents; i++) 52 52 if (src == map[i].src)
+1 -1
drivers/clk/qcom/mmcc-msm8960.c
··· 510 510 u32 val; 511 511 struct clk_pix_rdi *rdi = to_clk_pix_rdi(hw); 512 512 struct clk *clk = hw->clk; 513 - int num_parents = __clk_get_num_parents(hw->clk); 513 + int num_parents = clk_hw_get_num_parents(hw); 514 514 515 515 /* 516 516 * These clocks select three inputs via two muxes. One mux selects
+1 -1
drivers/clk/samsung/clk-s3c2410-dclk.c
··· 61 61 static u8 s3c24xx_clkout_get_parent(struct clk_hw *hw) 62 62 { 63 63 struct s3c24xx_clkout *clkout = to_s3c24xx_clkout(hw); 64 - int num_parents = __clk_get_num_parents(hw->clk); 64 + int num_parents = clk_hw_get_num_parents(hw); 65 65 u32 val; 66 66 67 67 val = readl_relaxed(S3C24XX_MISCCR) >> clkout->shift;
+2 -2
drivers/clk/shmobile/clk-div6.c
··· 133 133 134 134 hw_index = (clk_readl(clock->reg) >> clock->src_shift) & 135 135 (BIT(clock->src_width) - 1); 136 - for (i = 0; i < __clk_get_num_parents(hw->clk); i++) { 136 + for (i = 0; i < clk_hw_get_num_parents(hw); i++) { 137 137 if (clock->parents[i] == hw_index) 138 138 return i; 139 139 } ··· 149 149 u8 hw_index; 150 150 u32 mask; 151 151 152 - if (index >= __clk_get_num_parents(hw->clk)) 152 + if (index >= clk_hw_get_num_parents(hw)) 153 153 return -EINVAL; 154 154 155 155 mask = ~((BIT(clock->src_width) - 1) << clock->src_shift);
+1 -1
drivers/clk/sunxi/clk-factors.c
··· 87 87 unsigned long parent_rate, best = 0, child_rate, best_child_rate = 0; 88 88 89 89 /* find the parent that can help provide the fastest rate <= rate */ 90 - num_parents = __clk_get_num_parents(clk); 90 + num_parents = clk_hw_get_num_parents(hw); 91 91 for (i = 0; i < num_parents; i++) { 92 92 parent = clk_get_parent_by_index(clk, i); 93 93 if (!parent)
+1 -1
drivers/clk/sunxi/clk-sun6i-ar100.c
··· 47 47 static int ar100_determine_rate(struct clk_hw *hw, 48 48 struct clk_rate_request *req) 49 49 { 50 - int nparents = __clk_get_num_parents(hw->clk); 50 + int nparents = clk_hw_get_num_parents(hw); 51 51 long best_rate = -EINVAL; 52 52 int i; 53 53
+1 -1
drivers/clk/sunxi/clk-sunxi.c
··· 128 128 unsigned long parent_rate, best = 0, child_rate, best_child_rate = 0; 129 129 130 130 /* find the parent that can help provide the fastest rate <= rate */ 131 - num_parents = __clk_get_num_parents(clk); 131 + num_parents = clk_hw_get_num_parents(hw); 132 132 for (i = 0; i < num_parents; i++) { 133 133 parent = clk_get_parent_by_index(clk, i); 134 134 if (!parent)
+1 -1
drivers/clk/ti/mux.c
··· 31 31 static u8 ti_clk_mux_get_parent(struct clk_hw *hw) 32 32 { 33 33 struct clk_mux *mux = to_clk_mux(hw); 34 - int num_parents = __clk_get_num_parents(hw->clk); 34 + int num_parents = clk_hw_get_num_parents(hw); 35 35 u32 val; 36 36 37 37 /*