ASoC: soc-core: soc_find_component() uses snd_soc_is_matching_component()

ALSA SoC already has snd_soc_is_matching_component() to confirming
matching component, but, soc_find_component() has original
implementation to confirm component.

We shouldn't have duplicate implementation to do same things.
This patch uses snd_soc_is_matching_component() at soc_find_component()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 1b94119cfb0d0da6d79bc95a97e7e86aa44ab0d5..e6b95b7e27376de072da74d10954372927f491b1 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -780,22 +780,18 @@ static int snd_soc_is_matching_component(
 }
 
 static struct snd_soc_component *soc_find_component(
-       const struct device_node *of_node, const char *name)
+       struct device_node *of_node, const char *name)
 {
        struct snd_soc_component *component;
-       struct device_node *component_of_node;
+       struct snd_soc_dai_link_component dlc;
 
        lockdep_assert_held(&client_mutex);
 
        for_each_component(component) {
-               if (of_node) {
-                       component_of_node = soc_component_to_node(component);
-
-                       if (component_of_node == of_node)
-                               return component;
-               } else if (name && strcmp(component->name, name) == 0) {
+               dlc.name = name;
+               dlc.of_node = of_node;
+               if (snd_soc_is_matching_component(&dlc, component))
                        return component;
-               }
        }
 
        return NULL;