redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: soc-core: remove duplicate mutex_unlock from snd_soc_unregister_component() 

Current snd_soc_unregister_component() is using multiple mutex_unlock()
for found/non-found cases. But it is unreadable and confusable code.
This patch tidyup current code to be readable.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
hifive-unleashed-5.1
Kuninori Morimoto 2017-08-07 02:06:40 +00:00 committed by Mark Brown
parent cf9e829eaf
commit 21a035287e
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/soc/soc-core.c
View File

@ -3328,21 +3328,25 @@ EXPORT_SYMBOL_GPL(snd_soc_register_component);
void snd_soc_unregister_component(struct device *dev)
{
struct snd_soc_component *component;
int found = 0;
mutex_lock(&client_mutex);
list_for_each_entry(component, &component_list, list) {
if (dev == component->dev && component->registered_as_component)
goto found;
if (dev != component->dev ||
!component->registered_as_component)
continue;
snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL);
snd_soc_component_del_unlocked(component);
found = 1;
break;
}
mutex_unlock(&client_mutex);
return;
found:
snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL);
snd_soc_component_del_unlocked(component);
mutex_unlock(&client_mutex);
snd_soc_component_cleanup(component);
kfree(component);
if (found) {
snd_soc_component_cleanup(component);
kfree(component);
}
}
EXPORT_SYMBOL_GPL(snd_soc_unregister_component);