ASoC: use proper defines for stream directions in pcm engines

Signed-off-by: Joachim Eastwood <joachim.eastwood@jotron.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 4f59bbaba48f4fcb8ae70e0ced615f19ab71404e..96bb92dd174c0ae14c0b262ae4f55fd6df2d3f70 100644 (file)
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -311,23 +311,23 @@ static int fsl_dma_new(struct snd_soc_pcm_runtime *rtd)
         * should allocate a DMA buffer only for the streams that are valid.
         */
 
-       if (pcm->streams[0].substream) {
+       if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
                ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, card->dev,
                        fsl_dma_hardware.buffer_bytes_max,
-                       &pcm->streams[0].substream->dma_buffer);
+                       &pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->dma_buffer);
                if (ret) {
                        dev_err(card->dev, "can't alloc playback dma buffer\n");
                        return ret;
                }
        }
 
-       if (pcm->streams[1].substream) {
+       if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
                ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, card->dev,
                        fsl_dma_hardware.buffer_bytes_max,
-                       &pcm->streams[1].substream->dma_buffer);
+                       &pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->dma_buffer);
                if (ret) {
                        dev_err(card->dev, "can't alloc capture dma buffer\n");
-                       snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer);
+                       snd_dma_free_pages(&pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->dma_buffer);
                        return ret;
                }
        }

diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index e7803d34c425a35a8be366ccd5b9324b8eb41cad..2112e224a4ac166ba1b66bcf06cc8b28bbd5f952 100644 (file)
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -316,16 +316,16 @@ static int psc_dma_new(struct snd_soc_pcm_runtime *rtd)
        if (!card->dev->coherent_dma_mask)
                card->dev->coherent_dma_mask = 0xffffffff;
 
-       if (pcm->streams[0].substream) {
+       if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
                rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->card->dev,
-                               size, &pcm->streams[0].substream->dma_buffer);
+                               size, &pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->dma_buffer);
                if (rc)
                        goto playback_alloc_err;
        }
 
-       if (pcm->streams[1].substream) {
+       if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
                rc = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, pcm->card->dev,
-                               size, &pcm->streams[1].substream->dma_buffer);
+                               size, &pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->dma_buffer);
                if (rc)
                        goto capture_alloc_err;
        }
@@ -336,8 +336,8 @@ static int psc_dma_new(struct snd_soc_pcm_runtime *rtd)
        return 0;
 
  capture_alloc_err:
-       if (pcm->streams[0].substream)
-               snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer);
+       if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream)
+               snd_dma_free_pages(&pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->dma_buffer);
 
  playback_alloc_err:
        dev_err(card->dev, "Cannot allocate buffer(s)\n");

diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c
index 43c014f362f60643a9f5f4d798a2c651b6c0af1b..716da861c629399de5e5322b1556c4e7ae46d08e 100644 (file)
--- a/sound/soc/s6000/s6000-pcm.c
+++ b/sound/soc/s6000/s6000-pcm.c
@@ -435,7 +435,8 @@ static void s6000_pcm_free(struct snd_pcm *pcm)
 {
        struct snd_soc_pcm_runtime *runtime = pcm->private_data;
        struct s6000_pcm_dma_params *params =
-               snd_soc_dai_get_dma_data(runtime->cpu_dai, pcm->streams[0].substream);
+               snd_soc_dai_get_dma_data(runtime->cpu_dai,
+                       pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream);
 
        free_irq(params->irq, pcm);
        snd_pcm_lib_preallocate_free_for_all(pcm);
@@ -451,7 +452,7 @@ static int s6000_pcm_new(struct snd_soc_pcm_runtime *runtime)
        int res;
 
        params = snd_soc_dai_get_dma_data(runtime->cpu_dai,
-                       pcm->streams[0].substream);
+                       pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream);
 
        if (!card->dev->dma_mask)
                card->dev->dma_mask = &s6000_pcm_dmamask;