Skip to content

Commit afd529d

Browse files
masneybbroonie
authored andcommitted
ASoC: stm: stm32_i2s: 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 fc62ed6 commit afd529d

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

sound/soc/stm/stm32_i2s.c

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -461,20 +461,25 @@ static int stm32_i2s_set_parent_rate(struct stm32_i2s_data *i2s,
461461
return -EINVAL;
462462
}
463463

464-
static long stm32_i2smclk_round_rate(struct clk_hw *hw, unsigned long rate,
465-
unsigned long *prate)
464+
static int stm32_i2smclk_determine_rate(struct clk_hw *hw,
465+
struct clk_rate_request *req)
466466
{
467467
struct stm32_i2smclk_data *mclk = to_mclk_data(hw);
468468
struct stm32_i2s_data *i2s = mclk->i2s_data;
469469
int ret;
470470

471-
ret = stm32_i2s_calc_clk_div(i2s, *prate, rate);
472-
if (ret)
473-
return ret;
471+
ret = stm32_i2s_calc_clk_div(i2s, req->best_parent_rate, req->rate);
472+
if (ret) {
473+
req->rate = ret;
474474

475-
mclk->freq = *prate / i2s->divider;
475+
return 0;
476+
}
476477

477-
return mclk->freq;
478+
mclk->freq = req->best_parent_rate / i2s->divider;
479+
480+
req->rate = mclk->freq;
481+
482+
return 0;
478483
}
479484

480485
static unsigned long stm32_i2smclk_recalc_rate(struct clk_hw *hw,
@@ -530,7 +535,7 @@ static const struct clk_ops mclk_ops = {
530535
.enable = stm32_i2smclk_enable,
531536
.disable = stm32_i2smclk_disable,
532537
.recalc_rate = stm32_i2smclk_recalc_rate,
533-
.round_rate = stm32_i2smclk_round_rate,
538+
.determine_rate = stm32_i2smclk_determine_rate,
534539
.set_rate = stm32_i2smclk_set_rate,
535540
};
536541

0 commit comments

Comments
 (0)