diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-10 02:20:43 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-10 21:03:25 +0100 |
| commit | 16f1de6f3656519120fd4a88d6b21fc3da8d373a (patch) | |
| tree | 8c003ba0ebaa8aea1c64f4c3b978a201016cb772 /sound/soc/generic/simple-card.c | |
| parent | 983cebd602af8c2bf9d5830f15fb4e18fb38f994 (diff) | |
| download | talos-obmc-linux-16f1de6f3656519120fd4a88d6b21fc3da8d373a.tar.gz talos-obmc-linux-16f1de6f3656519120fd4a88d6b21fc3da8d373a.zip | |
ASoC: simple-card: use asoc_simple_card_canonicalize_cpu()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/generic/simple-card.c')
| -rw-r--r-- | sound/soc/generic/simple-card.c | 12 |
1 files changed, 1 insertions, 11 deletions
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); |
