Merge tag 'csky-for-linus-5.7-rc1' of git://github.com/c-sky/csky-linux

[linux-2.6-microblaze.git] / sound / soc / uniphier / aio-compress.c

diff --git a/sound/soc/uniphier/aio-compress.c b/sound/soc/uniphier/aio-compress.c
index 17f773a..232d3cc 100644 (file)
--- a/sound/soc/uniphier/aio-compress.c
+++ b/sound/soc/uniphier/aio-compress.c
@@ -23,7 +23,7 @@ static int uniphier_aio_comprdma_new(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_compr *compr = rtd->compr;
        struct device *dev = compr->card->dev;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[compr->direction];
        size_t size = AUD_RING_SIZE;
        int dma_dir = DMA_FROM_DEVICE, ret;
@@ -56,7 +56,7 @@ static int uniphier_aio_comprdma_free(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_compr *compr = rtd->compr;
        struct device *dev = compr->card->dev;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[compr->direction];
        int dma_dir = DMA_FROM_DEVICE;
 
@@ -73,7 +73,7 @@ static int uniphier_aio_comprdma_free(struct snd_soc_pcm_runtime *rtd)
 static int uniphier_aio_compr_open(struct snd_compr_stream *cstream)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
        int ret;
 
@@ -98,7 +98,7 @@ static int uniphier_aio_compr_open(struct snd_compr_stream *cstream)
 static int uniphier_aio_compr_free(struct snd_compr_stream *cstream)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
        int ret;
 
@@ -118,7 +118,7 @@ static int uniphier_aio_compr_get_params(struct snd_compr_stream *cstream,
                                         struct snd_codec *params)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 
        *params = sub->cparams.codec;
@@ -130,7 +130,7 @@ static int uniphier_aio_compr_set_params(struct snd_compr_stream *cstream,
                                         struct snd_compr_params *params)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
        struct device *dev = &aio->chip->pdev->dev;
        int ret;
@@ -165,7 +165,7 @@ static int uniphier_aio_compr_set_params(struct snd_compr_stream *cstream,
 static int uniphier_aio_compr_hw_free(struct snd_compr_stream *cstream)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 
        sub->setting = 0;
@@ -177,7 +177,7 @@ static int uniphier_aio_compr_prepare(struct snd_compr_stream *cstream)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
        struct snd_compr_runtime *runtime = cstream->runtime;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
        int bytes = runtime->fragment_size;
        unsigned long flags;
@@ -215,7 +215,7 @@ static int uniphier_aio_compr_trigger(struct snd_compr_stream *cstream,
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
        struct snd_compr_runtime *runtime = cstream->runtime;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
        struct device *dev = &aio->chip->pdev->dev;
        int bytes = runtime->fragment_size, ret = 0;
@@ -248,7 +248,7 @@ static int uniphier_aio_compr_pointer(struct snd_compr_stream *cstream,
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
        struct snd_compr_runtime *runtime = cstream->runtime;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
        int bytes = runtime->fragment_size;
        unsigned long flags;
@@ -322,7 +322,7 @@ static int uniphier_aio_compr_copy(struct snd_compr_stream *cstream,
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
        struct snd_compr_runtime *runtime = cstream->runtime;
        struct device *carddev = rtd->compr->card->dev;
-       struct uniphier_aio *aio = uniphier_priv(rtd->cpu_dai);
+       struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
        struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
        size_t cnt = min_t(size_t, count, aio_rb_space_to_end(sub) / 2);
        int bytes = runtime->fragment_size;