Skip to content

Commit 77b04dc

Browse files
committed
clk: sophgo: sg2042-clkgen: convert from divider_round_rate() to divider_determine_rate()
The divider_round_rate() function is now deprecated, so let's migrate to divider_determine_rate() instead so that this deprecated API can be removed. Note that when the main function itself was migrated to use determine_rate, this was mistakenly converted to: req->rate = divider_round_rate(...) This is invalid in the case when an error occurs since it can set the rate to a negative value. Note that this commit also removes a debugging message that's not really needed. Fixes: 9a3b699 ("clk: sophgo: sg2042-clkgen: convert from round_rate() to determine_rate()") Tested-by: Chen Wang <unicorn_wang@outlook.com> Reviewed-by: Chen Wang <unicorn_wang@outlook.com> Signed-off-by: Brian Masney <bmasney@redhat.com>
1 parent af94366 commit 77b04dc

1 file changed

Lines changed: 5 additions & 10 deletions

File tree

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ static int sg2042_clk_divider_determine_rate(struct clk_hw *hw,
180180
struct clk_rate_request *req)
181181
{
182182
struct sg2042_divider_clock *divider = to_sg2042_clk_divider(hw);
183-
unsigned long ret_rate;
184183
u32 bestdiv;
185184

186185
/* if read only, just return current value */
@@ -191,17 +190,13 @@ static int sg2042_clk_divider_determine_rate(struct clk_hw *hw,
191190
bestdiv = readl(divider->reg) >> divider->shift;
192191
bestdiv &= clk_div_mask(divider->width);
193192
}
194-
ret_rate = DIV_ROUND_UP_ULL((u64)req->best_parent_rate, bestdiv);
195-
} else {
196-
ret_rate = divider_round_rate(hw, req->rate, &req->best_parent_rate, NULL,
197-
divider->width, divider->div_flags);
198-
}
193+
req->rate = DIV_ROUND_UP_ULL((u64)req->best_parent_rate, bestdiv);
199194

200-
pr_debug("--> %s: divider_round_rate: val = %ld\n",
201-
clk_hw_get_name(hw), ret_rate);
202-
req->rate = ret_rate;
195+
return 0;
196+
}
203197

204-
return 0;
198+
return divider_determine_rate(hw, req, NULL, divider->width,
199+
divider->div_flags);
205200
}
206201

207202
static int sg2042_clk_divider_set_rate(struct clk_hw *hw,

0 commit comments

Comments
 (0)