From: Kuninori Morimoto Date: Wed, 10 Aug 2016 02:20:43 +0000 (+0000) Subject: ASoC: simple-card: use asoc_simple_card_canonicalize_cpu() X-Git-Tag: microblaze-4.10-rc1~157^2~4^2~2^3~15 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=16f1de6f3656519120fd4a88d6b21fc3da8d373a;p=linux-2.6-microblaze.git ASoC: simple-card: use asoc_simple_card_canonicalize_cpu() Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 8b1efdd2b115..64896e361bde 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -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);