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

diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c
index c5ce695da58668996e30ff0ab9146cc61c31ff74..ba56d6ac7e5715542071f831a37b17948f126220 100644 (file)
--- a/sound/soc/atmel/atmel-i2s.c
+++ b/sound/soc/atmel/atmel-i2s.c
@@ -533,7 +533,7 @@ static const struct snd_soc_dai_ops atmel_i2s_dai_ops = {
        .prepare        = atmel_i2s_prepare,
        .trigger        = atmel_i2s_trigger,
        .hw_params      = atmel_i2s_hw_params,
-       .set_fmt_new    = atmel_i2s_set_dai_fmt,
+       .set_fmt        = atmel_i2s_set_dai_fmt,
 };
 
 static int atmel_i2s_dai_probe(struct snd_soc_dai *dai)

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index da094762dc994b2278311f3f2905fbfe9f1b77f8..c92905e343e7ec77f824a60829a8c41ef88cd887 100644 (file)
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -835,7 +835,7 @@ static const struct snd_soc_dai_ops atmel_ssc_dai_ops = {
        .prepare        = atmel_ssc_prepare,
        .trigger        = atmel_ssc_trigger,
        .hw_params      = atmel_ssc_hw_params,
-       .set_fmt_new    = atmel_ssc_set_dai_fmt,
+       .set_fmt        = atmel_ssc_set_dai_fmt,
        .set_clkdiv     = atmel_ssc_set_dai_clkdiv,
 };
 

diff --git a/sound/soc/atmel/mchp-i2s-mcc.c b/sound/soc/atmel/mchp-i2s-mcc.c
index 48d434e0c3318bc49bfa53d5cf9782b9112d634d..269eab56b6dd9023e943ff73ec2d8cd02ca741a0 100644 (file)
--- a/sound/soc/atmel/mchp-i2s-mcc.c
+++ b/sound/soc/atmel/mchp-i2s-mcc.c
@@ -877,7 +877,7 @@ static const struct snd_soc_dai_ops mchp_i2s_mcc_dai_ops = {
        .trigger        = mchp_i2s_mcc_trigger,
        .hw_params      = mchp_i2s_mcc_hw_params,
        .hw_free        = mchp_i2s_mcc_hw_free,
-       .set_fmt_new    = mchp_i2s_mcc_set_dai_fmt,
+       .set_fmt        = mchp_i2s_mcc_set_dai_fmt,
        .set_tdm_slot   = mchp_i2s_mcc_set_dai_tdm_slot,
 };
 

diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c
index b3f04fa2f60893a7fad64e06706141a75c96a108..b9f63705944828001817f3a1668226abea6abe5d 100644 (file)
--- a/sound/soc/atmel/mchp-pdmc.c
+++ b/sound/soc/atmel/mchp-pdmc.c
@@ -708,7 +708,7 @@ static int mchp_pdmc_trigger(struct snd_pcm_substream *substream,
 }
 
 static const struct snd_soc_dai_ops mchp_pdmc_dai_ops = {
-       .set_fmt_new    = mchp_pdmc_set_fmt,
+       .set_fmt        = mchp_pdmc_set_fmt,
        .startup        = mchp_pdmc_startup,
        .shutdown       = mchp_pdmc_shutdown,
        .hw_params      = mchp_pdmc_hw_params,