From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue, 9 Aug 2016 05:50:02 +0000 (+0000)
Subject: ASoC: simple-card: use asoc_simple_card_canonicalize_dailink()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c958374f1cd22ec87f210985f9f9e1ba8b3df30b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

ASoC: simple-card: use asoc_simple_card_canonicalize_dailink()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 03ecca85a724..8b1efdd2b115 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",