ASoC: topology: Simplify code

Instead of using goto, when there is no controls, just do a loop when
there are. Overall the check seems to be a bit redundant as
num_kcontrols will only be above 0 if kcontrols are set anyway, but
let's keep it, while simplifying code.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://patch.msgid.link/20240627101850.2191513-2-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 4b166294602fa56790b283d6e007ea2b531ec998..dff83d49a8f61002a49868b54b94e772407c65af 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -394,13 +394,9 @@ static void soc_tplg_remove_widget(struct snd_soc_component *comp,
        if (dobj->unload)
                dobj->unload(comp, dobj);
 
-       if (!w->kcontrols)
-               goto free_news;
-
-       for (i = 0; w->kcontrols && i < w->num_kcontrols; i++)
-               snd_ctl_remove(card, w->kcontrols[i]);
-
-free_news:
+       if (w->kcontrols)
+               for (i = 0; i < w->num_kcontrols; i++)
+                       snd_ctl_remove(card, w->kcontrols[i]);
 
        list_del(&dobj->list);