From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
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@xxxxxxxxxxx>
---
sound/soc/soc-core.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ac68be0..db67103 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3326,21 +3326,25 @@ int snd_soc_register_component(struct device *dev,
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);
--
1.9.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
