ASoC: soc-core: use snd_soc_lookup_component() at snd_soc_unregister_component()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 5 Nov 2019 06:46:51 +0000 (15:46 +0900)
committerMark Brown <broonie@kernel.org>
Tue, 5 Nov 2019 23:50:26 +0000 (23:50 +0000)
snd_soc_unregister_component() is now finding component manually,
but we already have snd_soc_lookup_component() to find component;
Let's use existing function.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87zhha252c.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index bb059215941499d23bea8f4c166217592c76f9b3..0ce3336691386cb36c6e77cb08bdf306e004df25 100644 (file)
@@ -2876,29 +2876,19 @@ EXPORT_SYMBOL_GPL(snd_soc_register_component);
  *
  * @dev: The device to unregister
  */
-static int __snd_soc_unregister_component(struct device *dev)
+void snd_soc_unregister_component(struct device *dev)
 {
        struct snd_soc_component *component;
-       int found = 0;
 
        mutex_lock(&client_mutex);
-       for_each_component(component) {
-               if (dev != component->dev)
-                       continue;
+       while (1) {
+               component = snd_soc_lookup_component(dev, NULL);
+               if (!component)
+                       break;
 
                snd_soc_del_component_unlocked(component);
-               found = 1;
-               break;
        }
        mutex_unlock(&client_mutex);
-
-       return found;
-}
-
-void snd_soc_unregister_component(struct device *dev)
-{
-       while (__snd_soc_unregister_component(dev))
-               ;
 }
 EXPORT_SYMBOL_GPL(snd_soc_unregister_component);