ASoC: mediatek: 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-41-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
index 5f7c9516dfa1815b8a6093289b4470e6d2a20c69..c2e268054773df30f5a78e29a93d5a7c186579c9 100644 (file)
--- a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
+++ b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c
@@ -2346,7 +2346,7 @@ static const struct snd_soc_dai_ops mtk_dai_etdm_ops = {
        .hw_params = mtk_dai_etdm_hw_params,
        .trigger = mtk_dai_etdm_trigger,
        .set_sysclk = mtk_dai_etdm_set_sysclk,
-       .set_fmt_new = mtk_dai_etdm_set_fmt,
+       .set_fmt = mtk_dai_etdm_set_fmt,
        .set_tdm_slot = mtk_dai_etdm_set_tdm_slot,
 };
 
@@ -2356,7 +2356,7 @@ static const struct snd_soc_dai_ops mtk_dai_hdmitx_dptx_ops = {
        .hw_params      = mtk_dai_hdmitx_dptx_hw_params,
        .trigger        = mtk_dai_hdmitx_dptx_trigger,
        .set_sysclk     = mtk_dai_hdmitx_dptx_set_sysclk,
-       .set_fmt_new    = mtk_dai_etdm_set_fmt,
+       .set_fmt        = mtk_dai_etdm_set_fmt,
 };
 
 /* dai driver */

diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c b/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c
index 37a8968ac21dc1fecef5f2ca950ef6761f6721fd..caceb0deb467f90039a04917ee4215279bfc9d6d 100644 (file)
--- a/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c
+++ b/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c
@@ -282,7 +282,7 @@ static int mtk_dai_pcm_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 
 static const struct snd_soc_dai_ops mtk_dai_pcm_ops = {
        .prepare        = mtk_dai_pcm_prepare,
-       .set_fmt_new    = mtk_dai_pcm_set_fmt,
+       .set_fmt        = mtk_dai_pcm_set_fmt,
 };
 
 /* dai driver */