ASoC: simple-card: use asoc_simple_card_canonicalize_cpu()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 10 Aug 2016 02:20:43 +0000 (02:20 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 10 Aug 2016 20:03:25 +0000 (21:03 +0100)
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/simple-card.c

index 8b1efdd2b11512cd8d4f5ad82dd95cac910e32be..64896e361bded6ae4b4d4d266e46bd9d09fe1182 100644 (file)
@@ -309,17 +309,7 @@ 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;
+       asoc_simple_card_canonicalize_cpu(dai_link, single_cpu);
 
 dai_link_of_err:
        of_node_put(cpu);