ASoC: rsnd: remove io from rsnd_mod

Each Renesas sound mod (= SSI/SRC/DVC) might be called from many path
if it supports MIXer. In such case, mod <-> io is no longer 1:1
relationship. rsnd_mod_to_io() is no longer needed. Let's remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@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 1eca85ff3e916f2f5bda44fbb478c22376bd8318..f1e5920654f6ff74803b770ef31d66579fd9b8df 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -288,7 +288,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod,
        }
 
        io->mod[mod->type] = mod;
-       mod->io = io;
 
        return 0;
 }
@@ -296,7 +295,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod,
 static void rsnd_dai_disconnect(struct rsnd_mod *mod,
                                struct rsnd_dai_stream *io)
 {
-       mod->io = NULL;
        io->mod[mod->type] = NULL;
 }
 

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 756930bc1914bed63ec0212f30ae2a1aae141703..09fcc54a8ee067589c682df1b3b0390ea463b5ed 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -262,7 +262,6 @@ struct rsnd_mod {
        enum rsnd_mod_type type;
        struct rsnd_mod_ops *ops;
        struct rsnd_dma dma;
-       struct rsnd_dai_stream *io;
        struct rsnd_priv *priv;
        struct clk *clk;
        u32 status;
@@ -313,7 +312,6 @@ struct rsnd_mod {
 
 #define rsnd_mod_to_priv(mod) ((mod)->priv)
 #define rsnd_mod_to_dma(mod) (&(mod)->dma)
-#define rsnd_mod_to_io(mod) ((mod)->io)
 #define rsnd_mod_id(mod) ((mod)->id)
 #define rsnd_mod_hw_start(mod) clk_enable((mod)->clk)
 #define rsnd_mod_hw_stop(mod)  clk_disable((mod)->clk)