From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
sound/soc/sh/rcar/rsrc-card.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index e5432c1..a452150 100644
--- a/sound/soc/sh/rcar/rsrc-card.c
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -156,17 +156,6 @@ static int rsrc_card_parse_links(struct device_node *np,
if (ret < 0)
return ret;
- /*
- * 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 (is_single_links)
- dai_link->cpu_dai_name = NULL;
} else {
const struct rsrc_card_of_data *of_data;
@@ -222,6 +211,11 @@ static int rsrc_card_parse_links(struct device_node *np,
dai_link->dai_fmt,
dai_props->sysclk);
+ ret = asoc_simple_card_canonicalize_cpu(dai_link,
+ is_single_links);
+ if (ret)
+ return ret;
+
return 0;
}
--
1.9.1
