aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2014-03-03 23:51:03 -0500
committerMark Brown <broonie@linaro.org>2014-03-05 01:07:53 -0500
commit4076220767416b8b65009dd57eeb317c38d41baa (patch)
treec438cae1587db0e2835a1cf14ca163bef9973aba
parentff8f30e688477beead6d1e648fb11f321220a4d7 (diff)
ASoC: rsnd: nothing to do on rsnd_dai_remove()
rsnd_dai_remove() called rsnd_path_exit(), but these memory will be cleaned automatically. Because it is created by devm_kzalloc(). nothing to do on rsnd_dai_remove() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/sh/rcar/core.c36
1 files changed, 0 insertions, 36 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index e8e585de7251..92e155b7b6a7 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -348,14 +348,6 @@ static int rsnd_dai_connect(struct rsnd_mod *mod,
348 return 0; 348 return 0;
349} 349}
350 350
351static int rsnd_dai_disconnect(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
352{
353 io->mod[mod->type] = NULL;
354 mod->io = NULL;
355
356 return 0;
357}
358
359int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai) 351int rsnd_dai_id(struct rsnd_priv *priv, struct rsnd_dai *rdai)
360{ 352{
361 int id = rdai - priv->rdai; 353 int id = rdai - priv->rdai;
@@ -628,26 +620,6 @@ static int rsnd_path_init(struct rsnd_priv *priv,
628 return ret; 620 return ret;
629} 621}
630 622
631static int rsnd_path_exit(struct rsnd_priv *priv,
632 struct rsnd_dai *rdai,
633 struct rsnd_dai_stream *io)
634{
635 struct rsnd_mod *mod;
636 int ret = 0, i;
637
638 /*
639 * remove all mod from rdai
640 */
641 for (i = 0; i < RSND_MOD_MAX; i++) {
642 mod = io->mod[i];
643 if (!mod)
644 continue;
645 ret |= rsnd_dai_disconnect(mod, io);
646 }
647
648 return ret;
649}
650
651static int rsnd_dai_probe(struct platform_device *pdev, 623static int rsnd_dai_probe(struct platform_device *pdev,
652 struct rsnd_priv *priv) 624 struct rsnd_priv *priv)
653{ 625{
@@ -739,14 +711,6 @@ static int rsnd_dai_probe(struct platform_device *pdev,
739static void rsnd_dai_remove(struct platform_device *pdev, 711static void rsnd_dai_remove(struct platform_device *pdev,
740 struct rsnd_priv *priv) 712 struct rsnd_priv *priv)
741{ 713{
742 struct rsnd_dai *rdai;
743 int i;
744
745 for (i = 0; i < rsnd_rdai_nr(priv); i++) {
746 rdai = rsnd_dai_get(priv, i);
747 rsnd_path_exit(priv, rdai, &rdai->playback);
748 rsnd_path_exit(priv, rdai, &rdai->capture);
749 }
750} 714}
751 715
752/* 716/*