ASoC: soundwire: convert not to use asoc_xxx()

ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/874jk0qnga.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 26d8485427dd210a706bb7980fb23123c845abdb..1287a325c4359ce35a8ba899faa7692a7d118de2 100644 (file)
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -759,7 +759,7 @@ static int intel_prepare(struct snd_pcm_substream *substream,
        }
 
        if (dai_runtime->suspended) {
-               struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+               struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
                struct snd_pcm_hw_params *hw_params;
 
                hw_params = &rtd->dpcm[substream->stream].hw_params;

diff --git a/drivers/soundwire/intel_ace2x.c b/drivers/soundwire/intel_ace2x.c
index a9d25ae0b73fec3808f22f23b6e28146f592ad21..82672fcbc2aa27b7c6c252afcb73a0e46d33f57f 100644 (file)
--- a/drivers/soundwire/intel_ace2x.c
+++ b/drivers/soundwire/intel_ace2x.c
@@ -327,7 +327,7 @@ static int intel_prepare(struct snd_pcm_substream *substream,
        }
 
        if (dai_runtime->suspended) {
-               struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+               struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
                struct snd_pcm_hw_params *hw_params;
 
                hw_params = &rtd->dpcm[substream->stream].hw_params;

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index d77a8a0d42c8d33ae04cc9b1d52f401e716dd989..69719b335bcb1e4c9427d6c5331b5f5597e96725 100644 (file)
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -1819,7 +1819,7 @@ void sdw_shutdown_stream(void *sdw_substream)
        struct snd_soc_dai *dai;
 
        /* Find stream from first CPU DAI */
-       dai = asoc_rtd_to_cpu(rtd, 0);
+       dai = snd_soc_rtd_to_cpu(rtd, 0);
 
        sdw_stream = snd_soc_dai_get_stream(dai, substream->stream);