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

diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c
index b746e52aaf85fa16bf36c4ef4fe0c45389734414..382e9d8608a3fbacf8ab1414c7597bae65317cae 100644 (file)
--- a/sound/soc/pxa/mmp-sspa.c
+++ b/sound/soc/pxa/mmp-sspa.c
@@ -346,7 +346,7 @@ static const struct snd_soc_dai_ops mmp_sspa_dai_ops = {
        .hw_params      = mmp_sspa_hw_params,
        .set_sysclk     = mmp_sspa_set_dai_sysclk,
        .set_pll        = mmp_sspa_set_dai_pll,
-       .set_fmt_new    = mmp_sspa_set_dai_fmt,
+       .set_fmt        = mmp_sspa_set_dai_fmt,
 };
 
 static struct snd_soc_dai_driver mmp_sspa_dai = {

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 52124be1778eb744337bab2c3d5d8dccdb2ff65f..0f504a9f4983de365707018d1ca2981bc0f0c472 100644 (file)
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -824,7 +824,7 @@ static const struct snd_soc_dai_ops pxa_ssp_dai_ops = {
        .trigger        = pxa_ssp_trigger,
        .hw_params      = pxa_ssp_hw_params,
        .set_sysclk     = pxa_ssp_set_dai_sysclk,
-       .set_fmt_new    = pxa_ssp_set_dai_fmt,
+       .set_fmt        = pxa_ssp_set_dai_fmt,
        .set_tdm_slot   = pxa_ssp_set_dai_tdm_slot,
        .set_tristate   = pxa_ssp_set_dai_tristate,
 };

diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 9f12fc3615b659758c57be27ee6c5651886f0d0f..ffcf44e4dc8c07c51f50809e5ed755444ee6a81c 100644 (file)
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -333,7 +333,7 @@ static const struct snd_soc_dai_ops pxa_i2s_dai_ops = {
        .shutdown       = pxa2xx_i2s_shutdown,
        .trigger        = pxa2xx_i2s_trigger,
        .hw_params      = pxa2xx_i2s_hw_params,
-       .set_fmt_new    = pxa2xx_i2s_set_dai_fmt,
+       .set_fmt        = pxa2xx_i2s_set_dai_fmt,
        .set_sysclk     = pxa2xx_i2s_set_dai_sysclk,
 };