ASoC: rsnd: merge .nolock_start and .prepare

[linux.git] / sound / soc / sh / rcar / dma.c

diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index d3b1a4ae876adff2a9af09abb696489032f99e98..f99c1ab3b0bd2f0909a4446f2a79535fbed14c26 100644 (file)
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -106,9 +106,9 @@ static int rsnd_dmaen_stop(struct rsnd_mod *mod,
        return 0;
 }
 
-static int rsnd_dmaen_nolock_stop(struct rsnd_mod *mod,
-                                  struct rsnd_dai_stream *io,
-                                  struct rsnd_priv *priv)
+static int rsnd_dmaen_cleanup(struct rsnd_mod *mod,
+                             struct rsnd_dai_stream *io,
+                             struct rsnd_priv *priv)
 {
        struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
@@ -116,7 +116,7 @@ static int rsnd_dmaen_nolock_stop(struct rsnd_mod *mod,
        /*
         * DMAEngine release uses mutex lock.
         * Thus, it shouldn't be called under spinlock.
-        * Let's call it under nolock_start
+        * Let's call it under prepare
         */
        if (dmaen->chan)
                dma_release_channel(dmaen->chan);
@@ -126,9 +126,9 @@ static int rsnd_dmaen_nolock_stop(struct rsnd_mod *mod,
        return 0;
 }
 
-static int rsnd_dmaen_nolock_start(struct rsnd_mod *mod,
-                           struct rsnd_dai_stream *io,
-                           struct rsnd_priv *priv)
+static int rsnd_dmaen_prepare(struct rsnd_mod *mod,
+                             struct rsnd_dai_stream *io,
+                             struct rsnd_priv *priv)
 {
        struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
        struct rsnd_dmaen *dmaen = rsnd_dma_to_dmaen(dma);
@@ -142,7 +142,7 @@ static int rsnd_dmaen_nolock_start(struct rsnd_mod *mod,
        /*
         * DMAEngine request uses mutex lock.
         * Thus, it shouldn't be called under spinlock.
-        * Let's call it under nolock_start
+        * Let's call it under prepare
         */
        dmaen->chan = rsnd_dmaen_request_channel(io,
                                                 dma->mod_from,
@@ -287,8 +287,8 @@ static int rsnd_dmaen_pointer(struct rsnd_mod *mod,
 
 static struct rsnd_mod_ops rsnd_dmaen_ops = {
        .name   = "audmac",
-       .nolock_start = rsnd_dmaen_nolock_start,
-       .nolock_stop  = rsnd_dmaen_nolock_stop,
+       .prepare = rsnd_dmaen_prepare,
+       .cleanup = rsnd_dmaen_cleanup,
        .start  = rsnd_dmaen_start,
        .stop   = rsnd_dmaen_stop,
        .pointer= rsnd_dmaen_pointer,