Commit e7666eae authored by Brian Masney's avatar Brian Masney
Browse files

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: default avatarNobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Signed-off-by: default avatarBrian Masney <bmasney@redhat.com>
parent 775e9653

drivers/clk/visconti/pll.c

+11 −6
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ static unsigned long visconti_get_pll_rate_from_data(struct visconti_pll *pll, 
	return rate_table[0].rate;

}



static long visconti_pll_round_rate(struct clk_hw *hw,

				    unsigned long rate, unsigned long *prate)

static int visconti_pll_determine_rate(struct clk_hw *hw,

				       struct clk_rate_request *req)

{

	struct visconti_pll *pll = to_visconti_pll(hw);

	const struct visconti_pll_rate_table *rate_table = pll->rate_table;
@@ -109,11 +109,16 @@ static long visconti_pll_round_rate(struct clk_hw *hw, 


	/* Assuming rate_table is in descending order */

	for (i = 0; i < pll->rate_count; i++)

		if (rate >= rate_table[i].rate)

			return rate_table[i].rate;

		if (req->rate >= rate_table[i].rate) {

			req->rate = rate_table[i].rate;



			return 0;

		}



	/* return minimum supported value */

	return rate_table[i - 1].rate;

	req->rate = rate_table[i - 1].rate;



	return 0;

}



static unsigned long visconti_pll_recalc_rate(struct clk_hw *hw,
@@ -232,7 +237,7 @@ static const struct clk_ops visconti_pll_ops = { 
	.enable = visconti_pll_enable,

	.disable = visconti_pll_disable,

	.is_enabled = visconti_pll_is_enabled,

	.round_rate = visconti_pll_round_rate,

	.determine_rate = visconti_pll_determine_rate,

	.recalc_rate = visconti_pll_recalc_rate,

	.set_rate = visconti_pll_set_rate,

};