Merge tag 'v3.9-rc7' into asoc-dma

[deliverable/linux.git] / sound / soc / spear / spear_pcm.c

diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c
index 5e7aebe1e664bad240ded255bf03565f20670cc2..d653763f83b736ff9f13c49a5cd079405fd94fb2 100644 (file)
--- a/sound/soc/spear/spear_pcm.c
+++ b/sound/soc/spear/spear_pcm.c
@@ -64,21 +64,8 @@ static int spear_pcm_open(struct snd_pcm_substream *substream)
        if (ret)
                return ret;
 
-       ret = snd_dmaengine_pcm_open(substream, dma_data->filter, dma_data);
-       if (ret)
-               return ret;
-
-       snd_dmaengine_pcm_set_data(substream, dma_data);
-
-       return 0;
-}
-
-static int spear_pcm_close(struct snd_pcm_substream *substream)
-{
-
-       snd_dmaengine_pcm_close(substream);
-
-       return 0;
+       return snd_dmaengine_pcm_open_request_chan(substream, dma_data->filter,
+                               dma_data);
 }
 
 static int spear_pcm_mmap(struct snd_pcm_substream *substream,
@@ -93,7 +80,7 @@ static int spear_pcm_mmap(struct snd_pcm_substream *substream,
 
 static struct snd_pcm_ops spear_pcm_ops = {
        .open           = spear_pcm_open,
-       .close          = spear_pcm_close,
+       .close          = snd_dmaengine_pcm_close_release_chan,
        .ioctl          = snd_pcm_lib_ioctl,
        .hw_params      = spear_pcm_hw_params,
        .hw_free        = spear_pcm_hw_free,