clk: zynqmp: divider: 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: Brian Masney <bmasney@redhat.com>
This commit is contained in:
Brian Masney 2025-08-28 20:38:27 -04:00
parent f7a6bed91a
commit 0f9cf96a01

View File

@ -118,9 +118,8 @@ static unsigned long zynqmp_clk_divider_recalc_rate(struct clk_hw *hw,
* *
* Return: 0 on success else error+reason * Return: 0 on success else error+reason
*/ */
static long zynqmp_clk_divider_round_rate(struct clk_hw *hw, static int zynqmp_clk_divider_determine_rate(struct clk_hw *hw,
unsigned long rate, struct clk_rate_request *req)
unsigned long *prate)
{ {
struct zynqmp_clk_divider *divider = to_zynqmp_clk_divider(hw); struct zynqmp_clk_divider *divider = to_zynqmp_clk_divider(hw);
const char *clk_name = clk_hw_get_name(hw); const char *clk_name = clk_hw_get_name(hw);
@ -145,17 +144,21 @@ static long zynqmp_clk_divider_round_rate(struct clk_hw *hw,
if (divider->flags & CLK_DIVIDER_POWER_OF_TWO) if (divider->flags & CLK_DIVIDER_POWER_OF_TWO)
bestdiv = 1 << bestdiv; bestdiv = 1 << bestdiv;
return DIV_ROUND_UP_ULL((u64)*prate, bestdiv); req->rate = DIV_ROUND_UP_ULL((u64)req->best_parent_rate, bestdiv);
return 0;
} }
width = fls(divider->max_div); width = fls(divider->max_div);
rate = divider_round_rate(hw, rate, prate, NULL, width, divider->flags); req->rate = divider_round_rate(hw, req->rate, &req->best_parent_rate,
NULL, width, divider->flags);
if (divider->is_frac && (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) && (rate % *prate)) if (divider->is_frac && (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) &&
*prate = rate; (req->rate % req->best_parent_rate))
req->best_parent_rate = req->rate;
return rate; return 0;
} }
/** /**
@ -199,13 +202,13 @@ static int zynqmp_clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
static const struct clk_ops zynqmp_clk_divider_ops = { static const struct clk_ops zynqmp_clk_divider_ops = {
.recalc_rate = zynqmp_clk_divider_recalc_rate, .recalc_rate = zynqmp_clk_divider_recalc_rate,
.round_rate = zynqmp_clk_divider_round_rate, .determine_rate = zynqmp_clk_divider_determine_rate,
.set_rate = zynqmp_clk_divider_set_rate, .set_rate = zynqmp_clk_divider_set_rate,
}; };
static const struct clk_ops zynqmp_clk_divider_ro_ops = { static const struct clk_ops zynqmp_clk_divider_ro_ops = {
.recalc_rate = zynqmp_clk_divider_recalc_rate, .recalc_rate = zynqmp_clk_divider_recalc_rate,
.round_rate = zynqmp_clk_divider_round_rate, .determine_rate = zynqmp_clk_divider_determine_rate,
}; };
/** /**