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

Unverified Commit a9ec8496 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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

sound/soc/soc-core.c

+5 −9
Original line number Diff line number Diff line
@@ -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)

		dlc.name = name;

		dlc.of_node = of_node;

		if (snd_soc_is_matching_component(&dlc, component))

			return component;

		} else if (name && strcmp(component->name, name) == 0) {

			return component;

		}

	}



	return NULL;