Commit b8ba3b57 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ftmdahow.wl-kuninori.morimoto.gx@renesas.comReviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 32d2c172
...@@ -1264,7 +1264,6 @@ static int soc_probe_component(struct snd_soc_card *card, ...@@ -1264,7 +1264,6 @@ static int soc_probe_component(struct snd_soc_card *card,
soc_init_component_debugfs(component); 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->dapm_widgets,
component->driver->num_dapm_widgets); component->driver->num_dapm_widgets);
...@@ -1274,7 +1273,6 @@ static int soc_probe_component(struct snd_soc_card *card, ...@@ -1274,7 +1273,6 @@ static int soc_probe_component(struct snd_soc_card *card,
"Failed to create new controls %d\n", ret); "Failed to create new controls %d\n", ret);
goto err_probe; goto err_probe;
} }
}
for_each_component_dais(component, dai) { for_each_component_dais(component, dai) {
ret = snd_soc_dapm_new_dai_widgets(dapm, dai); ret = snd_soc_dapm_new_dai_widgets(dapm, dai);
...@@ -1990,13 +1988,15 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ...@@ -1990,13 +1988,15 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
INIT_WORK(&card->deferred_resume_work, soc_resume_deferred); INIT_WORK(&card->deferred_resume_work, soc_resume_deferred);
#endif #endif
if (card->dapm_widgets) ret = snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,
snd_soc_dapm_new_controls(&card->dapm, card->dapm_widgets,
card->num_dapm_widgets); card->num_dapm_widgets);
if (ret < 0)
goto probe_end;
if (card->of_dapm_widgets) ret = snd_soc_dapm_new_controls(&card->dapm, card->of_dapm_widgets,
snd_soc_dapm_new_controls(&card->dapm, card->of_dapm_widgets,
card->num_of_dapm_widgets); card->num_of_dapm_widgets);
if (ret < 0)
goto probe_end;
/* initialise the sound card only once */ /* initialise the sound card only once */
if (card->probe) { if (card->probe) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment