[PATCH v6 17/28] clk: Change clk_core_init_rate_req prototype

Maxime Ripard
2022-07-11T15:25:02Z

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: Maxime Ripard <maxime@cerno.tech>
---
drivers/clk/clk.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 6f5284f6cab5..6670e61edb31 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -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,
- struct clk_rate_request *req)
+ struct clk_rate_request *req,
+ unsigned long rate)
{
struct clk_core *parent;

if (WARN_ON(!core || !req))
return;

+ req->rate = rate;
+
parent = core->parent;
if (parent) {
req->best_parent_hw = parent->hw;
@@ -1412,7 +1415,7 @@ static int clk_core_round_rate_nolock(struct clk_core *core,
return 0;
}

- clk_core_init_rate_req(core, req);
+ clk_core_init_rate_req(core, req, req->rate);

if (clk_core_can_round(core))
return clk_core_determine_round_nolock(core, req);
@@ -2001,11 +2004,10 @@ static struct clk_core *clk_calc_new_rates(struct clk_core *core,
if (clk_core_can_round(core)) {
struct clk_rate_request req;

- req.rate = rate;
req.min_rate = min_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);
if (ret < 0)
--
2.36.1