ASoC: rsnd: remove un-needed parameter from rsnd_dma_init()

It can get DMA direction via rsnd_dai_stream.
Remove un-needed is_play from rsnd_dma_init().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 0b14d3762cff84e75806d4b36434696decf2b047..1edf4dc41c70dee6ad0a05c3bcd68c63f9aa67e7 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -311,13 +311,15 @@ static void rsnd_dma_of_path(struct rsnd_dma *dma,
        }
 }
 
-int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
-                 int is_play, int id)
+int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id)
 {
        struct device *dev = rsnd_priv_to_dev(priv);
        struct dma_slave_config cfg;
+       struct rsnd_mod *mod = rsnd_dma_to_mod(dma);
        struct rsnd_mod *mod_from;
        struct rsnd_mod *mod_to;
+       struct rsnd_dai_stream *io = rsnd_mod_to_io(mod);
+       int is_play = rsnd_io_is_play(io);
        char dma_name[DMA_NAME_SIZE];
        dma_cap_mask_t mask;
        int ret;

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 5ffde9b8955d684ed945ba0f237089b0421f0f22..93a1a256f37c137e77f69204ba4067bdc35e0fc3 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -179,8 +179,7 @@ struct rsnd_dma {
 void rsnd_dma_start(struct rsnd_dma *dma);
 void rsnd_dma_stop(struct rsnd_dma *dma);
 int rsnd_dma_available(struct rsnd_dma *dma);
-int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
-       int is_play, int id);
+int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma, int id);
 void  rsnd_dma_quit(struct rsnd_priv *priv,
                    struct rsnd_dma *dma);
 
@@ -413,19 +412,6 @@ struct rsnd_priv {
 #define rsnd_lock(priv, flags) spin_lock_irqsave(&priv->lock, flags)
 #define rsnd_unlock(priv, flags) spin_unlock_irqrestore(&priv->lock, flags)
 
-#define rsnd_info_is_playback(priv, type)                              \
-({                                                                     \
-       struct rcar_snd_info *info = rsnd_priv_to_info(priv);           \
-       int i, is_play = 0;                                             \
-       for (i = 0; i < info->dai_info_nr; i++) {                       \
-               if (info->dai_info[i].playback.type == (type)->info) {  \
-                       is_play = 1;                                    \
-                       break;                                          \
-               }                                                       \
-       }                                                               \
-       is_play;                                                        \
-})
-
 /*
  *     rsnd_kctrl
  */

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 81c182b4bad531c8afe3a071da4c9ad41c4d868f..7fb879871a8e348dccf185c29f9e5aae55dc6874 100644 (file)
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -713,7 +713,6 @@ static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
 
        ret = rsnd_dma_init(priv,
                            rsnd_mod_to_dma(mod),
-                           rsnd_info_is_playback(priv, src),
                            src->info->dma_id);
        if (ret)
                goto rsnd_src_probe_gen2_fail;

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 9e7b627c08e2256dbe09acd063432b7b3b7c1107..57e737c7046beb91abbc2b18c76282c9b91fbe25 100644 (file)
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -478,7 +478,6 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
 
        ret = rsnd_dma_init(
                priv, rsnd_mod_to_dma(mod),
-               rsnd_info_is_playback(priv, ssi),
                dma_id);
        if (ret)
                goto rsnd_ssi_dma_probe_fail;