ASoC: rockchip: Rename set_fmt_new back to set_fmt

Now the core has been migrated across to the new direct clock
specification we can move the drivers back to the normal set_fmt
callback.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220519154318.2153729-46-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 0a66c7df323dccce471219ad5e0dab24a9985ca0..47a3971a9ce14cf360daf07962c344cec07a6220 100644 (file)
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -486,7 +486,7 @@ static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = {
        .hw_params = rockchip_i2s_hw_params,
        .set_bclk_ratio = rockchip_i2s_set_bclk_ratio,
        .set_sysclk = rockchip_i2s_set_sysclk,
-       .set_fmt_new = rockchip_i2s_set_fmt,
+       .set_fmt = rockchip_i2s_set_fmt,
        .trigger = rockchip_i2s_trigger,
 };
 

diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c
index c90afccdae3625a1768b21fc91fba376e07157b1..48b3ecfa58b46f8c08c7e93fa156dad243f1b892 100644 (file)
--- a/sound/soc/rockchip/rockchip_i2s_tdm.c
+++ b/sound/soc/rockchip/rockchip_i2s_tdm.c
@@ -1113,7 +1113,7 @@ static const struct snd_soc_dai_ops rockchip_i2s_tdm_dai_ops = {
        .hw_params = rockchip_i2s_tdm_hw_params,
        .set_bclk_ratio = rockchip_i2s_tdm_set_bclk_ratio,
        .set_sysclk = rockchip_i2s_tdm_set_sysclk,
-       .set_fmt_new = rockchip_i2s_tdm_set_fmt,
+       .set_fmt = rockchip_i2s_tdm_set_fmt,
        .set_tdm_slot = rockchip_dai_tdm_slot,
        .trigger = rockchip_i2s_tdm_trigger,
 };