ASoC: samsung: 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>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220519154318.2153729-47-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 9ed275ebd744e7b4ef9dac5268d42dec4dd21a1d..fdd9561c6a9f361c02b581405bedeab95f515e0c 100644 (file)
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1107,7 +1107,7 @@ static int samsung_i2s_dai_remove(struct snd_soc_dai *dai)
 static const struct snd_soc_dai_ops samsung_i2s_dai_ops = {
        .trigger = i2s_trigger,
        .hw_params = i2s_hw_params,
-       .set_fmt_new = i2s_set_fmt,
+       .set_fmt = i2s_set_fmt,
        .set_clkdiv = i2s_set_clkdiv,
        .set_sysclk = i2s_set_sysclk,
        .startup = i2s_startup,

diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index 818172d8832d2cb6ff2ebded9917bbfa44ec959b..c2eb3534bfccb8bb6af357066e7e4d62a6c1f5ac 100644 (file)
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -437,7 +437,7 @@ static const struct snd_soc_dai_ops s3c_pcm_dai_ops = {
        .set_clkdiv     = s3c_pcm_set_clkdiv,
        .trigger        = s3c_pcm_trigger,
        .hw_params      = s3c_pcm_hw_params,
-       .set_fmt_new    = s3c_pcm_set_fmt,
+       .set_fmt        = s3c_pcm_set_fmt,
 };
 
 static int s3c_pcm_dai_probe(struct snd_soc_dai *dai)

diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index 9c8a0697849d798f1403fc39379ffe9284a45c2e..1bec72246ed0cf06ddf2ce792b4537a61cb3a050 100644 (file)
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -666,7 +666,7 @@ int s3c_i2sv2_register_component(struct device *dev, int id,
        ops->trigger = s3c2412_i2s_trigger;
        if (!ops->hw_params)
                ops->hw_params = s3c_i2sv2_hw_params;
-       ops->set_fmt_new = s3c2412_i2s_set_fmt;
+       ops->set_fmt = s3c2412_i2s_set_fmt;
        ops->set_clkdiv = s3c2412_i2s_set_clkdiv;
        ops->set_sysclk = s3c_i2sv2_set_sysclk;
 

diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 6226b3b585e541cc31044c6fbfdae8a684397dc2..4082ad7cbcc1144507b2b8d8187f1d71f805e308 100644 (file)
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -394,7 +394,7 @@ static int s3c24xx_i2s_resume(struct snd_soc_component *component)
 static const struct snd_soc_dai_ops s3c24xx_i2s_dai_ops = {
        .trigger        = s3c24xx_i2s_trigger,
        .hw_params      = s3c24xx_i2s_hw_params,
-       .set_fmt_new    = s3c24xx_i2s_set_fmt,
+       .set_fmt        = s3c24xx_i2s_set_fmt,
        .set_clkdiv     = s3c24xx_i2s_set_clkdiv,
        .set_sysclk     = s3c24xx_i2s_set_sysclk,
 };