[alsa-devel] [PATCH 5/6] ASoC: simple-card: use asoc_simple_card_canonicalize_dailink()
Kuninori Morimoto
kuninori.morimoto.gx at renesas.com
Tue Aug 9 07:50:02 CEST 2016
From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
---
sound/soc/generic/simple-card.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 03ecca8..8b1efdd 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -286,14 +286,9 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
if (ret < 0)
goto dai_link_of_err;
- if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) {
- ret = -EINVAL;
+ ret = asoc_simple_card_canonicalize_dailink(dai_link);
+ if (ret < 0)
goto dai_link_of_err;
- }
-
- /* Assumes platform == cpu */
- if (!dai_link->platform_of_node)
- dai_link->platform_of_node = dai_link->cpu_of_node;
ret = asoc_simple_card_set_dailink_name(dev, dai_link,
"%s-%s",
--
1.9.1
More information about the Alsa-devel
mailing list