]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: stm: stm32_i2s: convert from round_rate() to determine_rate()
authorBrian Masney <bmasney@redhat.com>
Thu, 10 Jul 2025 15:51:11 +0000 (11:51 -0400)
committerMark Brown <broonie@kernel.org>
Tue, 15 Jul 2025 12:38:54 +0000 (13:38 +0100)
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.

Signed-off-by: Brian Masney <bmasney@redhat.com>
Link: https://patch.msgid.link/20250710-sound-clk-round-rate-v1-5-4a9c3bb6ff3a@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/stm/stm32_i2s.c

index 6037b7a9c97bf25621fccb1feb59c4caee3250ca..0e489097d9c1086efcd9e3d1013acffeb0a46d4a 100644 (file)
@@ -461,20 +461,25 @@ err:
        return -EINVAL;
 }
 
-static long stm32_i2smclk_round_rate(struct clk_hw *hw, unsigned long rate,
-                                    unsigned long *prate)
+static int stm32_i2smclk_determine_rate(struct clk_hw *hw,
+                                       struct clk_rate_request *req)
 {
        struct stm32_i2smclk_data *mclk = to_mclk_data(hw);
        struct stm32_i2s_data *i2s = mclk->i2s_data;
        int ret;
 
-       ret = stm32_i2s_calc_clk_div(i2s, *prate, rate);
-       if (ret)
-               return ret;
+       ret = stm32_i2s_calc_clk_div(i2s, req->best_parent_rate, req->rate);
+       if (ret) {
+               req->rate = ret;
 
-       mclk->freq = *prate / i2s->divider;
+               return 0;
+       }
 
-       return mclk->freq;
+       mclk->freq = req->best_parent_rate / i2s->divider;
+
+       req->rate = mclk->freq;
+
+       return 0;
 }
 
 static unsigned long stm32_i2smclk_recalc_rate(struct clk_hw *hw,
@@ -530,7 +535,7 @@ static const struct clk_ops mclk_ops = {
        .enable = stm32_i2smclk_enable,
        .disable = stm32_i2smclk_disable,
        .recalc_rate = stm32_i2smclk_recalc_rate,
-       .round_rate = stm32_i2smclk_round_rate,
+       .determine_rate = stm32_i2smclk_determine_rate,
        .set_rate = stm32_i2smclk_set_rate,
 };