OSDN Git Service

ASoC: soc-core: remove unneeded snd_soc_tplg_component_remove()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 30 Oct 2019 01:26:10 +0000 (10:26 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 30 Oct 2019 12:55:45 +0000 (12:55 +0000)
snd_soc_tplg_component_remove() is pair of snd_soc_tplg_component_load(),
and it is topology related cleanup function.

The driver which called _load() needs to call _remove() by its responsibility.
Today, skl-pcm and topology are the user, and these are calling both
_load() and _remove().

soc-core doesn't need to call it.
This patch remove it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/8736fbdnwt.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index f1b41b0..b07ecfa 100644 (file)
@@ -2890,8 +2890,6 @@ static int __snd_soc_unregister_component(struct device *dev)
                if (dev != component->dev)
                        continue;
 
-               snd_soc_tplg_component_remove(component,
-                                             SND_SOC_TPLG_INDEX_ALL);
                snd_soc_component_del_unlocked(component);
                found = 1;
                break;