From: Kuninori Morimoto <kuninori.morimoto...@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto...@renesas.com>
---
sound/soc/generic/simple-card.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 11fd7de..c9178af 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -300,17 +300,9 @@ static int asoc_simple_card_dai_link_of(struct device_node
*node,
dai_link->codec_dai_name,
dai_props->codec_dai.sysclk);
- /*
- * In soc_bind_dai_link() will check cpu name after
- * of_node matching if dai_link has cpu_dai_name.
- * but, it will never match if name was created by
- * fmt_single_name() remove cpu_dai_name if cpu_args
- * was 0. See:
- * fmt_single_name()
- * fmt_multiple_name()
- */
- if (single_cpu)
- dai_link->cpu_dai_name = NULL;
+ ret = asoc_simple_card_canonicalize_cpu(dai_link, single_cpu);
+ if (ret < 0)
+ goto dai_link_of_err;
dai_link_of_err:
of_node_put(cpu);
--
1.9.1
