Commit 8bc614c6 authored by Brian Masney's avatar Brian Masney Committed by Chen-Yu Tsai
Browse files

clk: sunxi-ng: ccu_nkmp: 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>
Reviewed-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://patch.msgid.link/20250703-clk-cocci-drop-round-rate-v1-9-3a8da898367e@redhat.com


Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
parent 2b0d4f1b

drivers/clk/sunxi-ng/ccu_nkmp.c

+12 −11
Original line number Diff line number Diff line
@@ -127,20 +127,20 @@ static unsigned long ccu_nkmp_recalc_rate(struct clk_hw *hw, 
	return rate;

}



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

			      unsigned long *parent_rate)

static int ccu_nkmp_determine_rate(struct clk_hw *hw,

				   struct clk_rate_request *req)

{

	struct ccu_nkmp *nkmp = hw_to_ccu_nkmp(hw);

	struct _ccu_nkmp _nkmp;



	if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)

		rate *= nkmp->fixed_post_div;

		req->rate *= nkmp->fixed_post_div;



	if (nkmp->max_rate && rate > nkmp->max_rate) {

		rate = nkmp->max_rate;

	if (nkmp->max_rate && req->rate > nkmp->max_rate) {

		req->rate = nkmp->max_rate;

		if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)

			rate /= nkmp->fixed_post_div;

		return rate;

			req->rate /= nkmp->fixed_post_div;

		return 0;

	}



	_nkmp.min_n = nkmp->n.min ?: 1;
@@ -152,12 +152,13 @@ static long ccu_nkmp_round_rate(struct clk_hw *hw, unsigned long rate, 
	_nkmp.min_p = 1;

	_nkmp.max_p = nkmp->p.max ?: 1 << ((1 << nkmp->p.width) - 1);



	rate = ccu_nkmp_find_best(*parent_rate, rate, &_nkmp);

	req->rate = ccu_nkmp_find_best(req->best_parent_rate, req->rate,

				       &_nkmp);



	if (nkmp->common.features & CCU_FEATURE_FIXED_POSTDIV)

		rate = rate / nkmp->fixed_post_div;

		req->rate = req->rate / nkmp->fixed_post_div;



	return rate;

	return 0;

}



static int ccu_nkmp_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -227,7 +228,7 @@ const struct clk_ops ccu_nkmp_ops = { 
	.is_enabled	= ccu_nkmp_is_enabled,



	.recalc_rate	= ccu_nkmp_recalc_rate,

	.round_rate	= ccu_nkmp_round_rate,

	.determine_rate = ccu_nkmp_determine_rate,

	.set_rate	= ccu_nkmp_set_rate,

};

EXPORT_SYMBOL_NS_GPL(ccu_nkmp_ops, "SUNXI_CCU");