github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: soc-component: move snd_soc_is_matching_component() to soc-component.c

Browse Source 
struct snd_soc_component will be capsuled soon, its member will not be
able to access from non soc-component.c.

Move snd_soc_is_matching_component() to soc-component.c

It renames function name
-	snd_soc_is_matching_component()
+	snd_soc_component_matches_dlc()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Alvin Šipraga <alvin.sipraga@analog.com>
Link: https://patch.msgid.link/87h5ipyolm.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2026-10-14 02:59:02 +00:00 committed by Mark Brown
parent 81db2fed15
commit 78a856d727
No known key found for this signature in database
GPG Key ID: 2FEF73B0B3D03889
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sound/soc/soc-component.c
View File

@ -1287,3 +1287,30 @@ struct device_node *snd_soc_component_to_node(struct snd_soc_component *componen
return of_node;
}
bool snd_soc_component_matches_dlc(struct snd_soc_component *component,
const struct snd_soc_dai_link_component *dlc)
{
struct device_node *component_of_node;
if (!dlc)
return false;
if (dlc->dai_args) {
struct snd_soc_dai *dai;
for_each_component_dais(component, dai)
if (snd_soc_dai_matches_dlc(dai, dlc))
return true;
return false;
}
component_of_node = snd_soc_component_to_node(component);
if (dlc->of_node && component_of_node != dlc->of_node)
return false;
if (dlc->name && strcmp(component->name, dlc->name))
return false;
return true;
}

36
sound/soc/soc-core.c
View File

@ -785,34 +785,6 @@ struct of_phandle_args *snd_soc_copy_dai_args(struct device *dev,
}
EXPORT_SYMBOL_GPL(snd_soc_copy_dai_args);
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;
if (dlc->dai_args) {
struct snd_soc_dai *dai;
for_each_component_dais(component, dai)
if (snd_soc_dai_matches_dlc(dai, dlc))
return 1;
return 0;
}
component_of_node = snd_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 snd_soc_dai_link_component *dlc)
{
@ -829,7 +801,7 @@ static struct snd_soc_component *soc_find_component(
* CPU component and generic DMAEngine component
*/
for_each_component(component)
if (snd_soc_is_matching_component(dlc, component))
if (snd_soc_component_matches_dlc(component, dlc))
return component;
return NULL;
@ -856,7 +828,7 @@ struct snd_soc_dai *snd_soc_find_dai(
/* Find CPU DAI from registered DAIs */
for_each_component(component)
if (snd_soc_is_matching_component(dlc, component))
if (snd_soc_component_matches_dlc(component, dlc))
for_each_component_dais(component, dai)
if (snd_soc_dai_matches_dlc(dai, dlc))
return dai;
@ -1155,7 +1127,7 @@ static int snd_soc_add_pcm_runtime(struct snd_soc_card *card,
/* Find PLATFORM from registered PLATFORMs */
for_each_link_platforms(dai_link, i, platform) {
for_each_component(component) {
if (!snd_soc_is_matching_component(platform, component))
if (!snd_soc_component_matches_dlc(component, platform))
continue;
if (snd_soc_component_is_dummy(component) && component->num_dai)
@ -1334,7 +1306,7 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
for (i = 0; i < card->num_configs; i++) {
struct snd_soc_codec_conf *map = &card->codec_conf[i];
if (snd_soc_is_matching_component(&map->dlc, component) &&
if (snd_soc_component_matches_dlc(component, &map->dlc) &&
map->name_prefix) {
component->name_prefix = map->name_prefix;
return;

3
sound/soc/soc-internal.h
View File

@ -40,6 +40,7 @@ void snd_soc_dai_active_update(struct snd_soc_dai *dai, int stream, int action);
* In soc-component
*/
struct device_node *snd_soc_component_to_node(struct snd_soc_component *component);
bool snd_soc_component_matches_dlc(struct snd_soc_component *component,
const struct snd_soc_dai_link_component *dlc);
#endif /* __SOC_INTERNAL_H */