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: Maxime Ripard <maxime@cerno.tech>

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 17ae7e6a05e5a19612997fe29aaffee478141838..a18f4b2ec43fee3374f3eda510cfbca982933eb0 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1382,13 +1382,15 @@ 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;
        clk_core_get_boundaries(core, &req->min_rate, &req->max_rate);
 
        parent = core->parent;
@@ -1416,7 +1418,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);
@@ -2014,9 +2016,7 @@ 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;
-
-               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)