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

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 4058d60b7e9318b5497e117757cc09fb5b21cb03..f3edc2e3d9d7c492391e2c1f8eb682b87feeb410 100644 (file)
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1724,7 +1724,7 @@ static const struct snd_soc_dai_ops fsi_dai_ops = {
        .startup        = fsi_dai_startup,
        .shutdown       = fsi_dai_shutdown,
        .trigger        = fsi_dai_trigger,
-       .set_fmt_new    = fsi_dai_set_fmt,
+       .set_fmt        = fsi_dai_set_fmt,
        .hw_params      = fsi_dai_hw_params,
        .auto_selectable_formats        = &fsi_dai_formats,
        .num_auto_selectable_formats    = 1,

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 0ac15b74c58a89c9e0df93f370053b2aea04c548..a4180dc5a59baf715529c4a078e66869f52fac46 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1068,7 +1068,7 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
        .startup        = rsnd_soc_dai_startup,
        .shutdown       = rsnd_soc_dai_shutdown,
        .trigger        = rsnd_soc_dai_trigger,
-       .set_fmt_new    = rsnd_soc_dai_set_fmt,
+       .set_fmt        = rsnd_soc_dai_set_fmt,
        .set_tdm_slot   = rsnd_soc_set_dai_tdm_slot,
        .prepare        = rsnd_soc_dai_prepare,
        .auto_selectable_formats        = rsnd_soc_dai_formats,

diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c
index 0557d22a089f37cd5a9e8d71ee957da772483ee1..beaf1a8d6da10f1dea04289f01403be37a770cac 100644 (file)
--- a/sound/soc/sh/rz-ssi.c
+++ b/sound/soc/sh/rz-ssi.c
@@ -840,7 +840,7 @@ static int rz_ssi_dai_hw_params(struct snd_pcm_substream *substream,
 
 static const struct snd_soc_dai_ops rz_ssi_dai_ops = {
        .trigger        = rz_ssi_dai_trigger,
-       .set_fmt_new    = rz_ssi_dai_set_fmt,
+       .set_fmt        = rz_ssi_dai_set_fmt,
        .hw_params      = rz_ssi_dai_hw_params,
 };
 

diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c
index 95571cbeae29622027dac05bf3426e41abec99a7..bf7a3c69920a6e4e095b117787413a8408f4b6cb 100644 (file)
--- a/sound/soc/sh/ssi.c
+++ b/sound/soc/sh/ssi.c
@@ -336,7 +336,7 @@ static const struct snd_soc_dai_ops ssi_dai_ops = {
        .hw_params      = ssi_hw_params,
        .set_sysclk     = ssi_set_sysclk,
        .set_clkdiv     = ssi_set_clkdiv,
-       .set_fmt_new    = ssi_set_fmt,
+       .set_fmt        = ssi_set_fmt,
 };
 
 static struct snd_soc_dai_driver sh4_ssi_dai[] = {