Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21a03528 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cf9e829e

sound/soc/soc-core.c

+13 −9
Original line number Diff line number Diff line
@@ -3328,22 +3328,26 @@ 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;

	}

	mutex_unlock(&client_mutex);

	return;

		if (dev != component->dev ||

		    !component->registered_as_component)

			continue;



found:

		snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL);

		snd_soc_component_del_unlocked(component);

		found = 1;

		break;

	}

	mutex_unlock(&client_mutex);



	if (found) {

		snd_soc_component_cleanup(component);

		kfree(component);

	}

}

EXPORT_SYMBOL_GPL(snd_soc_unregister_component);



static int snd_soc_platform_drv_probe(struct snd_soc_component *component)