ASoC: soc-core: soc_probe_dai() code simplification

Current soc_probe_dai() is using deep nested condition.
Thus, it is difficult to read/understand.
This patch simplification it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 60a542f35dbde5039b911412ae7e07a113ff4d9c..574048a73b1c990a97a716be64ff3c9a8a56dc38 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1624,22 +1624,21 @@ static int soc_probe_link_components(struct snd_soc_card *card,
 
 static int soc_probe_dai(struct snd_soc_dai *dai, int order)
 {
-       int ret;
+       if (dai->probed ||
+           dai->driver->probe_order != order)
+               return 0;
 
-       if (!dai->probed && dai->driver->probe_order == order) {
-               if (dai->driver->probe) {
-                       ret = dai->driver->probe(dai);
-                       if (ret < 0) {
-                               dev_err(dai->dev,
-                                       "ASoC: failed to probe DAI %s: %d\n",
-                                       dai->name, ret);
-                               return ret;
-                       }
+       if (dai->driver->probe) {
+               int ret = dai->driver->probe(dai);
+               if (ret < 0) {
+                       dev_err(dai->dev, "ASoC: failed to probe DAI %s: %d\n",
+                               dai->name, ret);
+                       return ret;
                }
-
-               dai->probed = 1;
        }
 
+       dai->probed = 1;
+
        return 0;
 }