ASoC: simple-card: simplify code

The check of the mandatory fields is done for DT in its specific sequence.
Move the global check to the non-DT sequence.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 7722f830a45f7fbb8f2f7b23265793980bdf3397)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 2a1b1b5..f0784ca 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -225,16 +225,16 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
 
                memcpy(cinfo, dev->platform_data, sizeof(*cinfo));
                cinfo->snd_card.dev = dev;
-       }
 
-       if (!cinfo->name        ||
-           !cinfo->card        ||
-           !cinfo->codec_dai.name      ||
-           !(cinfo->codec              || of_codec)    ||
-           !(cinfo->platform           || of_platform) ||
-           !(cinfo->cpu_dai.name       || of_cpu)) {
-               dev_err(dev, "insufficient asoc_simple_card_info settings\n");
-               return -EINVAL;
+               if (!cinfo->name        ||
+                   !cinfo->card        ||
+                   !cinfo->codec_dai.name      ||
+                   !cinfo->codec       ||
+                   !cinfo->platform    ||
+                   !cinfo->cpu_dai.name) {
+                       dev_err(dev, "insufficient asoc_simple_card_info settings\n");
+                       return -EINVAL;
+               }
        }
 
        /*