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

diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index aa7d8e081f89a514b0c70affcf844e0cfe3e0527..e39c8d9f409952235edddacda007b9b7a965e9d0 100644 (file)
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -743,7 +743,7 @@ static const struct snd_soc_dai_ops bcm2835_i2s_dai_ops = {
        .prepare        = bcm2835_i2s_prepare,
        .trigger        = bcm2835_i2s_trigger,
        .hw_params      = bcm2835_i2s_hw_params,
-       .set_fmt_new    = bcm2835_i2s_set_dai_fmt,
+       .set_fmt        = bcm2835_i2s_set_dai_fmt,
        .set_bclk_ratio = bcm2835_i2s_set_dai_bclk_ratio,
        .set_tdm_slot   = bcm2835_i2s_set_dai_tdm_slot,
 };

diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
index 257f3657bcd6eb027f3a308a0590b44fdf6357cd..4bfa2d715ff4dd4843ac7399a775ca2c1fb1eabf 100644 (file)
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
@@ -1148,7 +1148,7 @@ static const struct snd_soc_dai_ops cygnus_ssp_dai_ops = {
        .shutdown       = cygnus_ssp_shutdown,
        .trigger        = cygnus_ssp_trigger,
        .hw_params      = cygnus_ssp_hw_params,
-       .set_fmt_new    = cygnus_ssp_set_fmt,
+       .set_fmt        = cygnus_ssp_set_fmt,
        .set_sysclk     = cygnus_ssp_set_sysclk,
        .set_tdm_slot   = cygnus_set_dai_tdm_slot,
 };