2 files changed, 29 insertions, 0 deletions

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 7316d10e4649..e8e585de7251 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -842,6 +842,7 @@ static int rsnd_probe(struct platform_device *pdev)
         struct rcar_snd_info *info;
         struct rsnd_priv *priv;
         struct device *dev = &pdev->dev;
+        struct rsnd_dai *rdai;
         int (*probe_func[])(struct platform_device *pdev,
                             struct rsnd_priv *priv) = {
                 rsnd_gen_probe,
@@ -880,6 +881,16 @@ static int rsnd_probe(struct platform_device *pdev)
                         return ret;
         }
 
+        for_each_rsnd_dai(rdai, priv, i) {
+                ret = rsnd_dai_call(rdai, &rdai->playback, probe);
+                if (ret)
+                        return ret;
+
+                ret = rsnd_dai_call(rdai, &rdai->capture, probe);
+                if (ret)
+                        return ret;
+        }
+
         /*
          *      asoc register
          */
@@ -912,9 +923,21 @@ exit_snd_soc:
 static int rsnd_remove(struct platform_device *pdev)
 {
         struct rsnd_priv *priv = dev_get_drvdata(&pdev->dev);
+        struct rsnd_dai *rdai;
+        int ret, i;
 
         pm_runtime_disable(&pdev->dev);
 
+        for_each_rsnd_dai(rdai, priv, i) {
+                ret = rsnd_dai_call(rdai, &rdai->playback, remove);
+                if (ret)
+                        return ret;
+
+                ret = rsnd_dai_call(rdai, &rdai->capture, remove);
+                if (ret)
+                        return ret;
+        }
+
         /*
          *      remove each module
          */
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 9205f96da2f4..db20b3721953 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -167,6 +167,12 @@ enum rsnd_mod_type {
 
 struct rsnd_mod_ops {
         char *name;
+        int (*probe)(struct rsnd_mod *mod,
+                     struct rsnd_dai *rdai,
+                     struct rsnd_dai_stream *io);
+        int (*remove)(struct rsnd_mod *mod,
+                      struct rsnd_dai *rdai,
+                      struct rsnd_dai_stream *io);
         int (*init)(struct rsnd_mod *mod,
                     struct rsnd_dai *rdai,
                     struct rsnd_dai_stream *io);