ASoC: convert asoc_xxx() to snd_soc_xxx()
authorMark Brown <broonie@kernel.org>
Tue, 26 Sep 2023 13:16:52 +0000 (15:16 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 26 Sep 2023 13:16:52 +0000 (15:16 +0200)
Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

ASoC is using 2 type of prefix (asoc_xxx() vs snd_soc_xxx()), but there
is no particular reason about that [1].
To reduce confusing, standarding these to snd_soc_xxx() is sensible.

This patch adds asoc_xxx() macro to keep compatible for a while.
It will be removed if all drivers were switched to new style.

Link: https://lore.kernel.org/r/87h6td3hus.wl-kuninori.morimoto.gx@renesas.com
1  2 
sound/soc/sh/dma-sh7760.c

index 85fe126233528252853f0c4e30959fbbe1f57bc3,9e26df823b763f1ba3806aa5f7252c4d602b943c..c53539482c208b50481c42baef62efe96fd25d28
@@@ -192,12 -192,12 +192,12 @@@ static int camelot_prepare(struct snd_s
                           struct snd_pcm_substream *substream)
  {
        struct snd_pcm_runtime *runtime = substream->runtime;
-       struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct camelot_pcm *cam = &cam_pcm_data[asoc_rtd_to_cpu(rtd, 0)->id];
+       struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
+       struct camelot_pcm *cam = &cam_pcm_data[snd_soc_rtd_to_cpu(rtd, 0)->id];
  
 -      pr_debug("PCM data: addr 0x%08lx len %d\n",
 -               (u32)runtime->dma_addr, runtime->dma_bytes);
 - 
 +      pr_debug("PCM data: addr %pad len %zu\n", &runtime->dma_addr,
 +               runtime->dma_bytes);
 +
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                BRGREG(BRGATXSAR) = (unsigned long)runtime->dma_area;
                BRGREG(BRGATXTCR) = runtime->dma_bytes;