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

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 872838d3e0a9452b853fde0c2dbdb6f3ee2d5fda..f58aa6406a874c1ea26e6eec79a43577cde3ee77 100644 (file)
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1081,7 +1081,7 @@ static int sun4i_i2s_set_tdm_slot(struct snd_soc_dai *dai,
 
 static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = {
        .hw_params      = sun4i_i2s_hw_params,
-       .set_fmt_new    = sun4i_i2s_set_fmt,
+       .set_fmt        = sun4i_i2s_set_fmt,
        .set_sysclk     = sun4i_i2s_set_sysclk,
        .set_tdm_slot   = sun4i_i2s_set_tdm_slot,
        .trigger        = sun4i_i2s_trigger,

diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index 6e9ef948d6621f821e4fe68ab3a31781ac5324ed..90d74a2d53f381ddf018e9d0b7c3041b4ae5886f 100644 (file)
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -630,7 +630,7 @@ done:
 }
 
 static const struct snd_soc_dai_ops sun8i_codec_dai_ops = {
-       .set_fmt_new    = sun8i_codec_set_fmt,
+       .set_fmt        = sun8i_codec_set_fmt,
        .set_tdm_slot   = sun8i_codec_set_tdm_slot,
        .startup        = sun8i_codec_startup,
        .hw_params      = sun8i_codec_hw_params,