aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffy Chen <jeffy.chen@rock-chips.com>2017-08-22 03:57:21 -0400
committerMark Brown <broonie@kernel.org>2017-08-22 08:45:55 -0400
commit4958471b0d2110a34df0b45803e6f24ed89b857b (patch)
tree4d73b3cfc8d8f3d035d10e75a41c343577a3f0f4
parent2eccea8cdeb8fe455fc3a45b4e097f118449c3ef (diff)
ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai
Currently we are searching dai name in snd_soc_find_dai, which could either be dai driver name or component device name(for legacy naming). Allow searching dai driver name in snd_soc_find_dai too, so that we can use dai driver name to find legacy naming dais. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/soc-core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 50c8dba54649..6fab0ff213ef 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1000,7 +1000,7 @@ static struct snd_soc_component *soc_find_component(
1000/** 1000/**
1001 * snd_soc_find_dai - Find a registered DAI 1001 * snd_soc_find_dai - Find a registered DAI
1002 * 1002 *
1003 * @dlc: name of the DAI and optional component info to match 1003 * @dlc: name of the DAI or the DAI driver and optional component info to match
1004 * 1004 *
1005 * This function will search all registered components and their DAIs to 1005 * This function will search all registered components and their DAIs to
1006 * find the DAI of the same name. The component's of_node and name 1006 * find the DAI of the same name. The component's of_node and name
@@ -1028,7 +1028,8 @@ struct snd_soc_dai *snd_soc_find_dai(
1028 if (dlc->name && strcmp(component->name, dlc->name)) 1028 if (dlc->name && strcmp(component->name, dlc->name))
1029 continue; 1029 continue;
1030 list_for_each_entry(dai, &component->dai_list, list) { 1030 list_for_each_entry(dai, &component->dai_list, list) {
1031 if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)) 1031 if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)
1032 && strcmp(dai->driver->name, dlc->dai_name))
1032 continue; 1033 continue;
1033 1034
1034 return dai; 1035 return dai;