aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2015-06-15 02:28:03 -0400
committerMark Brown <broonie@kernel.org>2015-06-16 07:34:05 -0400
commit8a4e379b54f8cf1180cfee8ad3bfe16beedac65b (patch)
tree17a089901166355e326aab5ccf9274d29e338be1
parentd5bbe7de563ccce62765f1183561218b6dbdbe1e (diff)
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>
-rw-r--r--sound/soc/sh/rcar/core.c2
-rw-r--r--sound/soc/sh/rcar/rsnd.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 1eca85ff3e91..f1e5920654f6 100644
--- 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,
288 } 288 }
289 289
290 io->mod[mod->type] = mod; 290 io->mod[mod->type] = mod;
291 mod->io = io;
292 291
293 return 0; 292 return 0;
294} 293}
@@ -296,7 +295,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod,
296static void rsnd_dai_disconnect(struct rsnd_mod *mod, 295static void rsnd_dai_disconnect(struct rsnd_mod *mod,
297 struct rsnd_dai_stream *io) 296 struct rsnd_dai_stream *io)
298{ 297{
299 mod->io = NULL;
300 io->mod[mod->type] = NULL; 298 io->mod[mod->type] = NULL;
301} 299}
302 300
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 756930bc1914..09fcc54a8ee0 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -262,7 +262,6 @@ struct rsnd_mod {
262 enum rsnd_mod_type type; 262 enum rsnd_mod_type type;
263 struct rsnd_mod_ops *ops; 263 struct rsnd_mod_ops *ops;
264 struct rsnd_dma dma; 264 struct rsnd_dma dma;
265 struct rsnd_dai_stream *io;
266 struct rsnd_priv *priv; 265 struct rsnd_priv *priv;
267 struct clk *clk; 266 struct clk *clk;
268 u32 status; 267 u32 status;
@@ -313,7 +312,6 @@ struct rsnd_mod {
313 312
314#define rsnd_mod_to_priv(mod) ((mod)->priv) 313#define rsnd_mod_to_priv(mod) ((mod)->priv)
315#define rsnd_mod_to_dma(mod) (&(mod)->dma) 314#define rsnd_mod_to_dma(mod) (&(mod)->dma)
316#define rsnd_mod_to_io(mod) ((mod)->io)
317#define rsnd_mod_id(mod) ((mod)->id) 315#define rsnd_mod_id(mod) ((mod)->id)
318#define rsnd_mod_hw_start(mod) clk_enable((mod)->clk) 316#define rsnd_mod_hw_start(mod) clk_enable((mod)->clk)
319#define rsnd_mod_hw_stop(mod) clk_disable((mod)->clk) 317#define rsnd_mod_hw_stop(mod) clk_disable((mod)->clk)