ASoC: soc-dai: add snd_soc_dai_remove()

Current ALSA SoC is directly using dai->driver->xxx,
thus, it has deep nested bracket, and it makes code unreadable.
This patch adds new snd_soc_dai_remvoe() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87imruhn1x.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index da8d8b8890893bd714c8302b6546629344153d5e..2a11f177ce0135a0ee6aceedc8881f09bfdfa853 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -165,6 +165,7 @@ snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,
 void snd_soc_dai_suspend(struct snd_soc_dai *dai);
 void snd_soc_dai_resume(struct snd_soc_dai *dai);
 int snd_soc_dai_probe(struct snd_soc_dai *dai);
+int snd_soc_dai_remove(struct snd_soc_dai *dai);
 
 struct snd_soc_dai_ops {
        /*

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3e73468225f9898967e7ea1d21547f381120a3f1..727fd342b3fbca1a1ba04afbdc7aa243687a3455 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -992,13 +992,12 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order)
            dai->driver->remove_order != order)
                return;
 
-       if (dai->driver->remove) {
-               err = dai->driver->remove(dai);
-               if (err < 0)
-                       dev_err(dai->dev,
-                               "ASoC: failed to remove %s: %d\n",
-                               dai->name, err);
-       }
+       err = snd_soc_dai_remove(dai);
+       if (err < 0)
+               dev_err(dai->dev,
+                       "ASoC: failed to remove %s: %d\n",
+                       dai->name, err);
+
        dai->probed = 0;
 }
 

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 55c1fac9961361980d8f54156e803bc9d179e7b1..384765c747daebb9593b506f7d69f66f2da5e678 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -372,3 +372,10 @@ int snd_soc_dai_probe(struct snd_soc_dai *dai)
                return dai->driver->probe(dai);
        return 0;
 }
+
+int snd_soc_dai_remove(struct snd_soc_dai *dai)
+{
+       if (dai->driver->remove)
+               return dai->driver->remove(dai);
+       return 0;
+}