Commit 718af795 authored by Maxime Ripard's avatar Maxime Ripard Committed by Stephen Boyd

clk: Change clk_core_init_rate_req prototype

The expectation is that a clk_rate_request structure is supposed to be
initialized using clk_core_init_rate_req(), yet the rate we want to
request still needs to be set by hand.

Let's just pass the rate as a function argument so that callers don't
have any extra work to do.

Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> # imx8mp
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> # exynos4210, meson g12b
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220816112530.1837489-15-maxime@cerno.techTested-by: default avatarLinux Kernel Functional Testing <lkft@linaro.org>
Tested-by: default avatarNaresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent cb1b1dd9
...@@ -1380,13 +1380,16 @@ static int clk_core_determine_round_nolock(struct clk_core *core, ...@@ -1380,13 +1380,16 @@ static int clk_core_determine_round_nolock(struct clk_core *core,
} }
static void clk_core_init_rate_req(struct clk_core * const core, static void clk_core_init_rate_req(struct clk_core * const core,
struct clk_rate_request *req) struct clk_rate_request *req,
unsigned long rate)
{ {
struct clk_core *parent; struct clk_core *parent;
if (WARN_ON(!core || !req)) if (WARN_ON(!core || !req))
return; return;
req->rate = rate;
parent = core->parent; parent = core->parent;
if (parent) { if (parent) {
req->best_parent_hw = parent->hw; req->best_parent_hw = parent->hw;
...@@ -1412,7 +1415,7 @@ static int clk_core_round_rate_nolock(struct clk_core *core, ...@@ -1412,7 +1415,7 @@ static int clk_core_round_rate_nolock(struct clk_core *core,
return 0; return 0;
} }
clk_core_init_rate_req(core, req); clk_core_init_rate_req(core, req, req->rate);
if (clk_core_can_round(core)) if (clk_core_can_round(core))
return clk_core_determine_round_nolock(core, req); return clk_core_determine_round_nolock(core, req);
...@@ -2004,11 +2007,10 @@ static struct clk_core *clk_calc_new_rates(struct clk_core *core, ...@@ -2004,11 +2007,10 @@ static struct clk_core *clk_calc_new_rates(struct clk_core *core,
if (clk_core_can_round(core)) { if (clk_core_can_round(core)) {
struct clk_rate_request req; struct clk_rate_request req;
req.rate = rate;
req.min_rate = min_rate; req.min_rate = min_rate;
req.max_rate = max_rate; req.max_rate = max_rate;
clk_core_init_rate_req(core, &req); clk_core_init_rate_req(core, &req, rate);
ret = clk_core_determine_round_nolock(core, &req); ret = clk_core_determine_round_nolock(core, &req);
if (ret < 0) if (ret < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment