Skip to content

Commit d5f317f

Browse files
masneybbroonie
authored andcommitted
ASoC: stm: stm32_sai_sub: 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 <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent afd529d commit d5f317f

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

sound/soc/stm/stm32_sai_sub.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -489,20 +489,22 @@ static int stm32_sai_set_parent_rate(struct stm32_sai_sub_data *sai,
489489
return -EINVAL;
490490
}
491491

492-
static long stm32_sai_mclk_round_rate(struct clk_hw *hw, unsigned long rate,
493-
unsigned long *prate)
492+
static int stm32_sai_mclk_determine_rate(struct clk_hw *hw,
493+
struct clk_rate_request *req)
494494
{
495495
struct stm32_sai_mclk_data *mclk = to_mclk_data(hw);
496496
struct stm32_sai_sub_data *sai = mclk->sai_data;
497497
int div;
498498

499-
div = stm32_sai_get_clk_div(sai, *prate, rate);
499+
div = stm32_sai_get_clk_div(sai, req->best_parent_rate, req->rate);
500500
if (div <= 0)
501501
return -EINVAL;
502502

503-
mclk->freq = *prate / div;
503+
mclk->freq = req->best_parent_rate / div;
504504

505-
return mclk->freq;
505+
req->rate = mclk->freq;
506+
507+
return 0;
506508
}
507509

508510
static unsigned long stm32_sai_mclk_recalc_rate(struct clk_hw *hw,
@@ -558,7 +560,7 @@ static const struct clk_ops mclk_ops = {
558560
.enable = stm32_sai_mclk_enable,
559561
.disable = stm32_sai_mclk_disable,
560562
.recalc_rate = stm32_sai_mclk_recalc_rate,
561-
.round_rate = stm32_sai_mclk_round_rate,
563+
.determine_rate = stm32_sai_mclk_determine_rate,
562564
.set_rate = stm32_sai_mclk_set_rate,
563565
};
564566

0 commit comments

Comments
 (0)