ASoC: soc-core: tidyup for snd_soc_dapm_new_controls()

snd_soc_dapm_new_controls() registers controls by using
for(... i < num; ...). It means if widget was NULL, num should be zero.
Thus, we don't need to check about widget pointer.
This patch also cares missing return value.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ftmdahow.wl-kuninori.morimoto.gx@renesas.com
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index d12054ab87418887bd21f353b5c659aae85900d0..bb1e9e2c4ff464aa8cc356537892d9aecac25cdd 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1264,16 +1264,14 @@ static int soc_probe_component(struct snd_soc_card *card,
 
        soc_init_component_debugfs(component);
 
-       if (component->driver->dapm_widgets) {
-               ret = snd_soc_dapm_new_controls(dapm,
+       ret = snd_soc_dapm_new_controls(dapm,
                                        component->driver->dapm_widgets,
                                        component->driver->num_dapm_widgets);
 
-               if (ret != 0) {
-                       dev_err(component->dev,
-                               "Failed to create new controls %d\n", ret);
-                       goto err_probe;
-               }
+       if (ret != 0) {
+               dev_err(component->dev,
+                       "Failed to create new controls %d\n", ret);
+               goto err_probe;
        }
 
        for_each_component_dais(component, dai) {
@@ -1990,13 +1988,15 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
        INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
 #endif
 
-       if (card->dapm_widgets)
-               snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,
-                                         card->num_dapm_widgets);
+       ret = snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,
+                                       card->num_dapm_widgets);
+       if (ret < 0)
+               goto probe_end;
 
-       if (card->of_dapm_widgets)
-               snd_soc_dapm_new_controls(&card->dapm, card->of_dapm_widgets,
-                                         card->num_of_dapm_widgets);
+       ret = snd_soc_dapm_new_controls(&card->dapm, card->of_dapm_widgets,
+                                       card->num_of_dapm_widgets);
+       if (ret < 0)
+               goto probe_end;
 
        /* initialise the sound card only once */
        if (card->probe) {