Browse Source

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>
Kuninori Morimoto 9 years ago
parent
commit
c958374f1c
1 changed files with 2 additions and 7 deletions
  1. 2 7
      sound/soc/generic/simple-card.c

+ 2 - 7
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)
 	if (ret < 0)
 		goto dai_link_of_err;
 		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;
 		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,
 	ret = asoc_simple_card_set_dailink_name(dev, dai_link,
 						"%s-%s",
 						"%s-%s",