ASoC: stm: 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/87y1hcqnjo.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c
index a8fff73786413dcc2053a7b07601899fea6b4077..fb5dd9a68bea8d0a46330270c9ca74762ccdcb05 100644 (file)
--- a/sound/soc/stm/stm32_adfsdm.c
+++ b/sound/soc/stm/stm32_adfsdm.c
@@ -167,7 +167,7 @@ static void stm32_memcpy_32to16(void *dest, const void *src, size_t n)
 static int stm32_afsdm_pcm_cb(const void *data, size_t size, void *private)
 {
        struct stm32_adfsdm_priv *priv = private;
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(priv->substream);
+       struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(priv->substream);
        u8 *pcm_buff = priv->pcm_buff;
        u8 *src_buff = (u8 *)data;
        unsigned int old_pos = priv->pos;
@@ -212,9 +212,9 @@ static int stm32_afsdm_pcm_cb(const void *data, size_t size, void *private)
 static int stm32_adfsdm_trigger(struct snd_soc_component *component,
                                struct snd_pcm_substream *substream, int cmd)
 {
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+       struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
        struct stm32_adfsdm_priv *priv =
-               snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+               snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0));
 
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
@@ -233,8 +233,8 @@ static int stm32_adfsdm_trigger(struct snd_soc_component *component,
 static int stm32_adfsdm_pcm_open(struct snd_soc_component *component,
                                 struct snd_pcm_substream *substream)
 {
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct stm32_adfsdm_priv *priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+       struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
+       struct stm32_adfsdm_priv *priv = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0));
        int ret;
 
        ret =  snd_soc_set_runtime_hwparams(substream, &stm32_adfsdm_pcm_hw);
@@ -247,9 +247,9 @@ static int stm32_adfsdm_pcm_open(struct snd_soc_component *component,
 static int stm32_adfsdm_pcm_close(struct snd_soc_component *component,
                                  struct snd_pcm_substream *substream)
 {
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+       struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
        struct stm32_adfsdm_priv *priv =
-               snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+               snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0));
 
        priv->substream = NULL;
 
@@ -260,9 +260,9 @@ static snd_pcm_uframes_t stm32_adfsdm_pcm_pointer(
                                            struct snd_soc_component *component,
                                            struct snd_pcm_substream *substream)
 {
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+       struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
        struct stm32_adfsdm_priv *priv =
-               snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+               snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0));
 
        return bytes_to_frames(substream->runtime, priv->pos);
 }
@@ -271,9 +271,9 @@ static int stm32_adfsdm_pcm_hw_params(struct snd_soc_component *component,
                                      struct snd_pcm_substream *substream,
                                      struct snd_pcm_hw_params *params)
 {
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+       struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
        struct stm32_adfsdm_priv *priv =
-               snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+               snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0));
 
        priv->pcm_buff = substream->runtime->dma_area;
 
@@ -286,7 +286,7 @@ static int stm32_adfsdm_pcm_new(struct snd_soc_component *component,
 {
        struct snd_pcm *pcm = rtd->pcm;
        struct stm32_adfsdm_priv *priv =
-               snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));
+               snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0));
        unsigned int size = DFSDM_MAX_PERIODS * DFSDM_MAX_PERIOD_SIZE;
 
        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,

diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c
index 0acc848c1f004d7218ba0d42496003591074245b..8bcb98d9b64e6a53fd96f989adb2af17678ae877 100644 (file)
--- a/sound/soc/stm/stm32_sai_sub.c
+++ b/sound/soc/stm/stm32_sai_sub.c
@@ -1249,8 +1249,8 @@ static int stm32_sai_pcm_process_spdif(struct snd_pcm_substream *substream,
                                       unsigned long bytes)
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+       struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
+       struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
        struct stm32_sai_sub_data *sai = dev_get_drvdata(cpu_dai->dev);
        int *ptr = (int *)(runtime->dma_area + hwoff +
                           channel * (runtime->dma_bytes / runtime->channels));