Skip to content

Commit 9a3b699

Browse files
committed
clk: sophgo: sg2042-clkgen: 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: Chen Wang <unicorn_wang@outlook.com> Tested-by: Chen Wang <unicorn_wang@outlook.com> # Pioneerbox Signed-off-by: Brian Masney <bmasney@redhat.com>
1 parent e20c5ab commit 9a3b699

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

drivers/clk/sophgo/clk-sg2042-clkgen.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,8 @@ static unsigned long sg2042_clk_divider_recalc_rate(struct clk_hw *hw,
176176
return ret_rate;
177177
}
178178

179-
static long sg2042_clk_divider_round_rate(struct clk_hw *hw,
180-
unsigned long rate,
181-
unsigned long *prate)
179+
static int sg2042_clk_divider_determine_rate(struct clk_hw *hw,
180+
struct clk_rate_request *req)
182181
{
183182
struct sg2042_divider_clock *divider = to_sg2042_clk_divider(hw);
184183
unsigned long ret_rate;
@@ -192,15 +191,17 @@ static long sg2042_clk_divider_round_rate(struct clk_hw *hw,
192191
bestdiv = readl(divider->reg) >> divider->shift;
193192
bestdiv &= clk_div_mask(divider->width);
194193
}
195-
ret_rate = DIV_ROUND_UP_ULL((u64)*prate, bestdiv);
194+
ret_rate = DIV_ROUND_UP_ULL((u64)req->best_parent_rate, bestdiv);
196195
} else {
197-
ret_rate = divider_round_rate(hw, rate, prate, NULL,
196+
ret_rate = divider_round_rate(hw, req->rate, &req->best_parent_rate, NULL,
198197
divider->width, divider->div_flags);
199198
}
200199

201200
pr_debug("--> %s: divider_round_rate: val = %ld\n",
202201
clk_hw_get_name(hw), ret_rate);
203-
return ret_rate;
202+
req->rate = ret_rate;
203+
204+
return 0;
204205
}
205206

206207
static int sg2042_clk_divider_set_rate(struct clk_hw *hw,
@@ -258,13 +259,13 @@ static int sg2042_clk_divider_set_rate(struct clk_hw *hw,
258259

259260
static const struct clk_ops sg2042_clk_divider_ops = {
260261
.recalc_rate = sg2042_clk_divider_recalc_rate,
261-
.round_rate = sg2042_clk_divider_round_rate,
262+
.determine_rate = sg2042_clk_divider_determine_rate,
262263
.set_rate = sg2042_clk_divider_set_rate,
263264
};
264265

265266
static const struct clk_ops sg2042_clk_divider_ro_ops = {
266267
.recalc_rate = sg2042_clk_divider_recalc_rate,
267-
.round_rate = sg2042_clk_divider_round_rate,
268+
.determine_rate = sg2042_clk_divider_determine_rate,
268269
};
269270

270271
/*

0 commit comments

Comments
 (0)