ASoC: codecs: rt5682: convert from round_rate() to determine_rate()

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-2-4a9c3bb6ff3a@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
index 7c88370e2dee6a4c2332f1e3db885c980f5e8079..a0abd2ce0c1e1f6cf59fecdd426db16136befe66 100644 (file)
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@ -2675,8 +2675,8 @@ static unsigned long rt5682_wclk_recalc_rate(struct clk_hw *hw,
        return rt5682->lrck[RT5682_AIF1];
 }
 
-static long rt5682_wclk_round_rate(struct clk_hw *hw, unsigned long rate,
-                                  unsigned long *parent_rate)
+static int rt5682_wclk_determine_rate(struct clk_hw *hw,
+                                     struct clk_rate_request *req)
 {
        struct rt5682_priv *rt5682 =
                container_of(hw, struct rt5682_priv,
@@ -2689,13 +2689,13 @@ static long rt5682_wclk_round_rate(struct clk_hw *hw, unsigned long rate,
         * Only accept to set wclk rate to 44.1k or 48kHz.
         * It will force to 48kHz if not both.
         */
-       if (rate != CLK_48 && rate != CLK_44) {
+       if (req->rate != CLK_48 && req->rate != CLK_44) {
                dev_warn(rt5682->i2c_dev, "%s: clk %s only support %d or %d Hz output\n",
                        __func__, clk_name, CLK_44, CLK_48);
-               rate = CLK_48;
+               req->rate = CLK_48;
        }
 
-       return rate;
+       return 0;
 }
 
 static int rt5682_wclk_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -2795,15 +2795,15 @@ static unsigned long rt5682_bclk_get_factor(unsigned long rate,
                return 256;
 }
 
-static long rt5682_bclk_round_rate(struct clk_hw *hw, unsigned long rate,
-                                  unsigned long *parent_rate)
+static int rt5682_bclk_determine_rate(struct clk_hw *hw,
+                                     struct clk_rate_request *req)
 {
        struct rt5682_priv *rt5682 =
                container_of(hw, struct rt5682_priv,
                             dai_clks_hw[RT5682_DAI_BCLK_IDX]);
        unsigned long factor;
 
-       if (!*parent_rate || !rt5682_clk_check(rt5682))
+       if (!req->best_parent_rate || !rt5682_clk_check(rt5682))
                return -EINVAL;
 
        /*
@@ -2813,9 +2813,11 @@ static long rt5682_bclk_round_rate(struct clk_hw *hw, unsigned long rate,
         * and find the appropriate multiplier of BCLK to
         * get the rounded down BCLK value.
         */
-       factor = rt5682_bclk_get_factor(rate, *parent_rate);
+       factor = rt5682_bclk_get_factor(req->rate, req->best_parent_rate);
+
+       req->rate = req->best_parent_rate * factor;
 
-       return *parent_rate * factor;
+       return 0;
 }
 
 static int rt5682_bclk_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -2849,12 +2851,12 @@ static const struct clk_ops rt5682_dai_clk_ops[RT5682_DAI_NUM_CLKS] = {
                .prepare = rt5682_wclk_prepare,
                .unprepare = rt5682_wclk_unprepare,
                .recalc_rate = rt5682_wclk_recalc_rate,
-               .round_rate = rt5682_wclk_round_rate,
+               .determine_rate = rt5682_wclk_determine_rate,
                .set_rate = rt5682_wclk_set_rate,
        },
        [RT5682_DAI_BCLK_IDX] = {
                .recalc_rate = rt5682_bclk_recalc_rate,
-               .round_rate = rt5682_bclk_round_rate,
+               .determine_rate = rt5682_bclk_determine_rate,
                .set_rate = rt5682_bclk_set_rate,
        },
 };