ASoC: au1x: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/871rpjk5tw.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c
index d6b692fff29a29b51fcd4dd1c220f691b75dd836..d649037bda9b8e3da6c7046a576f1af3b72c9bfa 100644 (file)
--- a/sound/soc/au1x/db1200.c
+++ b/sound/soc/au1x/db1200.c
@@ -95,7 +95,7 @@ static struct snd_soc_card db1550_ac97_machine = {
 static int db1200_i2s_startup(struct snd_pcm_substream *substream)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
 
        /* WM8731 has its own 12MHz crystal */
        snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,

diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c
index 8f855644c6b4f302e444abbd0ce88535c959e142..e82bbf2d1eea78701f09f7aeb0086139f06f0c06 100644 (file)
--- a/sound/soc/au1x/dbdma2.c
+++ b/sound/soc/au1x/dbdma2.c
@@ -281,7 +281,7 @@ static int au1xpsc_pcm_open(struct snd_soc_component *component,
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        int stype = substream->stream, *dmaids;
 
-       dmaids = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+       dmaids = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
        if (!dmaids)
                return -ENODEV; /* whoa, has ordering changed? */
 

diff --git a/sound/soc/au1x/dma.c b/sound/soc/au1x/dma.c
index c9a038a5e2d34dab9bd3c2fe86eeed007ec438b5..4e246c7e78f247c6af56374351752db3ce104e70 100644 (file)
--- a/sound/soc/au1x/dma.c
+++ b/sound/soc/au1x/dma.c
@@ -195,7 +195,7 @@ static int alchemy_pcm_open(struct snd_soc_component *component,
        int *dmaids, s = substream->stream;
        char *name;
 
-       dmaids = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
+       dmaids = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
        if (!dmaids)
                return -ENODEV; /* whoa, has ordering changed? */
 

diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c
index 0227993c5da8abb15f943422ce75993e0344ceca..05eb36991f147a8dcbeb631961e4e4b76a31c776 100644 (file)
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
@@ -58,7 +58,7 @@ static struct au1xpsc_audio_data *au1xpsc_ac97_workdata;
 static inline struct au1xpsc_audio_data *ac97_to_pscdata(struct snd_ac97 *x)
 {
        struct snd_soc_card *c = x->bus->card->private_data;
-       return snd_soc_dai_get_drvdata(c->rtd->cpu_dai);
+       return snd_soc_dai_get_drvdata(c->asoc_rtd_to_cpu(rtd, 0));
 }
 
 #else