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

clk: visconti: pll: convert from round_rate() to determine_rate()

The round_rate() clk ops is deprecated, so migrate this driver from
round_rate() to determine_rate() using the Coccinelle semantic patch
on the cover letter of this series.

Reviewed-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Signed-off-by: Brian Masney <bmasney@redhat.com>

+11 -6
+11 -6
drivers/clk/visconti/pll.c
··· 100 100 return rate_table[0].rate; 101 101 } 102 102 103 - static long visconti_pll_round_rate(struct clk_hw *hw, 104 - unsigned long rate, unsigned long *prate) 103 + static int visconti_pll_determine_rate(struct clk_hw *hw, 104 + struct clk_rate_request *req) 105 105 { 106 106 struct visconti_pll *pll = to_visconti_pll(hw); 107 107 const struct visconti_pll_rate_table *rate_table = pll->rate_table; ··· 109 109 110 110 /* Assuming rate_table is in descending order */ 111 111 for (i = 0; i < pll->rate_count; i++) 112 - if (rate >= rate_table[i].rate) 113 - return rate_table[i].rate; 112 + if (req->rate >= rate_table[i].rate) { 113 + req->rate = rate_table[i].rate; 114 + 115 + return 0; 116 + } 114 117 115 118 /* return minimum supported value */ 116 - return rate_table[i - 1].rate; 119 + req->rate = rate_table[i - 1].rate; 120 + 121 + return 0; 117 122 } 118 123 119 124 static unsigned long visconti_pll_recalc_rate(struct clk_hw *hw, ··· 237 232 .enable = visconti_pll_enable, 238 233 .disable = visconti_pll_disable, 239 234 .is_enabled = visconti_pll_is_enabled, 240 - .round_rate = visconti_pll_round_rate, 235 + .determine_rate = visconti_pll_determine_rate, 241 236 .recalc_rate = visconti_pll_recalc_rate, 242 237 .set_rate = visconti_pll_set_rate, 243 238 };