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

clk: cdce706: 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.

Signed-off-by: default avatarBrian Masney <bmasney@redhat.com>
parent 64613d7f

drivers/clk/clk-cdce706.c

+9 −7
Original line number Diff line number Diff line
@@ -183,8 +183,8 @@ static unsigned long cdce706_pll_recalc_rate(struct clk_hw *hw, 
	return 0;

}



static long cdce706_pll_round_rate(struct clk_hw *hw, unsigned long rate,

				   unsigned long *parent_rate)

static int cdce706_pll_determine_rate(struct clk_hw *hw,

				      struct clk_rate_request *req)

{

	struct cdce706_hw_data *hwd = to_hw_data(hw);

	unsigned long mul, div;
@@ -192,9 +192,9 @@ static long cdce706_pll_round_rate(struct clk_hw *hw, unsigned long rate, 


	dev_dbg(&hwd->dev_data->client->dev,

		"%s, rate: %lu, parent_rate: %lu\n",

		__func__, rate, *parent_rate);

		__func__, req->rate, req->best_parent_rate);



	rational_best_approximation(rate, *parent_rate,

	rational_best_approximation(req->rate, req->best_parent_rate,

				    CDCE706_PLL_N_MAX, CDCE706_PLL_M_MAX,

				    &mul, &div);

	hwd->mul = mul;
@@ -204,9 +204,11 @@ static long cdce706_pll_round_rate(struct clk_hw *hw, unsigned long rate, 
		"%s, pll: %d, mul: %lu, div: %lu\n",

		__func__, hwd->idx, mul, div);



	res = (u64)*parent_rate * hwd->mul;

	res = (u64)req->best_parent_rate * hwd->mul;

	do_div(res, hwd->div);

	return res;

	req->rate = res;



	return 0;

}



static int cdce706_pll_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -251,7 +253,7 @@ static int cdce706_pll_set_rate(struct clk_hw *hw, unsigned long rate, 


static const struct clk_ops cdce706_pll_ops = {

	.recalc_rate = cdce706_pll_recalc_rate,

	.round_rate = cdce706_pll_round_rate,

	.determine_rate = cdce706_pll_determine_rate,

	.set_rate = cdce706_pll_set_rate,

};