Merge remote-tracking branch 'asoc/topic/dma' into asoc-next

1 files changed, 2 insertions, 16 deletions

diff --git a/sound/soc/spear/spear_pcm.c b/sound/soc/spear/spear_pcm.c
index 5e7aebe1e664..23fb09addd21 100644
--- a/sound/soc/spear/spear_pcm.c
+++ b/sound/soc/spear/spear_pcm.c
@@ -64,21 +64,7 @@ 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(substream, dma_data->filter, dma_data)
 }
 
 static int spear_pcm_mmap(struct snd_pcm_substream *substream,
@@ -93,7 +79,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,
         .ioctl          = snd_pcm_lib_ioctl,
         .hw_params      = spear_pcm_hw_params,
         .hw_free        = spear_pcm_hw_free,