From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
simple-card is assuming that sometimes platform and cpu are same.
This patch makes this method simple style standard.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
include/sound/simple_card_core.h | 2 ++
sound/soc/generic/simple-card-core.c | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/include/sound/simple_card_core.h b/include/sound/simple_card_core.h
index 9146825..2db9de8 100644
--- a/include/sound/simple_card_core.h
+++ b/include/sound/simple_card_core.h
@@ -97,4 +97,6 @@ void asoc_simple_card_remove_jack(struct asoc_simple_jack *sjack);
int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
struct asoc_simple_dai *simple_dai);
+int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link);
+
#endif /* __SIMPLE_CARD_CORE_H */
diff --git a/sound/soc/generic/simple-card-core.c b/sound/soc/generic/simple-card-core.c
index cc638e9..5c2ea50 100644
--- a/sound/soc/generic/simple-card-core.c
+++ b/sound/soc/generic/simple-card-core.c
@@ -360,3 +360,16 @@ int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
return 0;
}
EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai);
+
+int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link)
+{
+ if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name)
+ return -EINVAL;
+
+ /* Assumes platform == cpu */
+ if (!dai_link->platform_of_node)
+ dai_link->platform_of_node = dai_link->cpu_of_node;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_dailink);
--
1.9.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
