[alsa-devel] [PATCH 22/25] ASoC: soc-component: add snd_soc_component_of_xlate_dai_name()
Kuninori Morimoto
kuninori.morimoto.gx at renesas.com
Wed Jul 24 03:53:04 CEST 2019
From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Current ALSA SoC is directly using component->driver->xxx,
thus, it is deep nested, and makes code difficult to read,
and is not good for encapsulation.
This patch adds new snd_soc_component_of_xlate_dai_name() and use it
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
---
include/sound/soc-component.h | 3 +++
sound/soc/soc-component.c | 10 ++++++++++
sound/soc/soc-core.c | 7 ++-----
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index b8553aa..37b25cc 100644
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -363,5 +363,8 @@ int snd_soc_component_probe(struct snd_soc_component *component);
void snd_soc_component_remove(struct snd_soc_component *component);
int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
struct device_node *ep);
+int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
+ struct of_phandle_args *args,
+ const char **dai_name);
#endif /* __SOC_COMPONENT_H */
diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 7dabcf7..732f06a 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -459,3 +459,13 @@ int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
return component->driver->of_xlate_dai_id(component, ep);
return -ENOTSUPP;
}
+
+int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
+ struct of_phandle_args *args,
+ const char **dai_name)
+{
+ if (component->driver->of_xlate_dai_name)
+ return component->driver->of_xlate_dai_name(component,
+ args, dai_name);
+ return -ENOTSUPP;
+}
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 9ec34a6..573192d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3404,11 +3404,8 @@ int snd_soc_get_dai_name(struct of_phandle_args *args,
if (component_of_node != args->np)
continue;
- if (pos->driver->of_xlate_dai_name) {
- ret = pos->driver->of_xlate_dai_name(pos,
- args,
- dai_name);
- } else {
+ ret = snd_soc_component_of_xlate_dai_name(pos, args, dai_name);
+ if (ret == -ENOTSUPP) {
struct snd_soc_dai *dai;
int id = -1;
--
2.7.4
More information about the Alsa-devel
mailing list