From 7d7db5d3c3d849c2f877be3b4c9afa7f5b5257c2 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 20 Jun 2019 09:49:17 +0900 Subject: [PATCH] ASoC: soc-core: move soc_find_component() move soc_find_component() next to snd_soc_is_matching_component(). This is prepare for soc_find_component() cleanup Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/soc-core.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4cd77cd6c864..1b94119cfb0d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -760,6 +760,25 @@ static struct device_node return of_node; } +static int snd_soc_is_matching_component( + const struct snd_soc_dai_link_component *dlc, + struct snd_soc_component *component) +{ + struct device_node *component_of_node; + + if (!dlc) + return 0; + + component_of_node = soc_component_to_node(component); + + if (dlc->of_node && component_of_node != dlc->of_node) + return 0; + if (dlc->name && strcmp(component->name, dlc->name)) + return 0; + + return 1; +} + static struct snd_soc_component *soc_find_component( const struct device_node *of_node, const char *name) { @@ -782,25 +801,6 @@ static struct snd_soc_component *soc_find_component( return NULL; } -static int snd_soc_is_matching_component( - const struct snd_soc_dai_link_component *dlc, - struct snd_soc_component *component) -{ - struct device_node *component_of_node; - - if (!dlc) - return 0; - - component_of_node = soc_component_to_node(component); - - if (dlc->of_node && component_of_node != dlc->of_node) - return 0; - if (dlc->name && strcmp(component->name, dlc->name)) - return 0; - - return 1; -} - /** * snd_soc_find_dai - Find a registered DAI * -- 2.11.0