Commit 78d4c18e authored by Brian Masney's avatar Brian Masney
Browse files

clk: st: clkgen-fsyn: 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 c349d81d

drivers/clk/st/clkgen-fsyn.c

+17 −16
Original line number Diff line number Diff line
@@ -375,22 +375,21 @@ static int clk_fs660c32_vco_get_params(unsigned long input, 
	return 0;

}



static long quadfs_pll_fs660c32_round_rate(struct clk_hw *hw,

					   unsigned long rate,

					   unsigned long *prate)

static int quadfs_pll_fs660c32_determine_rate(struct clk_hw *hw,

					      struct clk_rate_request *req)

{

	struct stm_fs params;



	if (clk_fs660c32_vco_get_params(*prate, rate, &params))

		return rate;

	if (clk_fs660c32_vco_get_params(req->best_parent_rate, req->rate, &params))

		return 0;



	clk_fs660c32_vco_get_rate(*prate, &params, &rate);

	clk_fs660c32_vco_get_rate(req->best_parent_rate, &params, &req->rate);



	pr_debug("%s: %s new rate %ld [ndiv=%u]\n",

		 __func__, clk_hw_get_name(hw),

		 rate, (unsigned int)params.ndiv);

		 req->rate, (unsigned int)params.ndiv);



	return rate;

	return 0;

}



static int quadfs_pll_fs660c32_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -436,7 +435,7 @@ static const struct clk_ops st_quadfs_pll_c32_ops = { 
	.disable	= quadfs_pll_disable,

	.is_enabled	= quadfs_pll_is_enabled,

	.recalc_rate	= quadfs_pll_fs660c32_recalc_rate,

	.round_rate	= quadfs_pll_fs660c32_round_rate,

	.determine_rate = quadfs_pll_fs660c32_determine_rate,

	.set_rate	= quadfs_pll_fs660c32_set_rate,

};
@@ -814,19 +813,21 @@ static unsigned long quadfs_recalc_rate(struct clk_hw *hw, 
	return rate;

}



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

				     unsigned long *prate)

static int quadfs_determine_rate(struct clk_hw *hw,

				 struct clk_rate_request *req)

{

	struct stm_fs params;



	rate = quadfs_find_best_rate(hw, rate, *prate, &params);

	req->rate = quadfs_find_best_rate(hw, req->rate,

					  req->best_parent_rate, &params);



	pr_debug("%s: %s new rate %ld [sdiv=0x%x,md=0x%x,pe=0x%x,nsdiv3=%u]\n",

		 __func__, clk_hw_get_name(hw),

		 rate, (unsigned int)params.sdiv, (unsigned int)params.mdiv,

		 req->rate, (unsigned int)params.sdiv,

		 (unsigned int)params.mdiv,

		 (unsigned int)params.pe, (unsigned int)params.nsdiv);



	return rate;

	return 0;

}
@@ -873,7 +874,7 @@ static const struct clk_ops st_quadfs_ops = { 
	.enable		= quadfs_fsynth_enable,

	.disable	= quadfs_fsynth_disable,

	.is_enabled	= quadfs_fsynth_is_enabled,

	.round_rate	= quadfs_round_rate,

	.determine_rate = quadfs_determine_rate,

	.set_rate	= quadfs_set_rate,

	.recalc_rate	= quadfs_recalc_rate,

};