diff options
| author |  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
| 2016-08-09 05:50:02 +0000 |
|---|---|---|
| committer |  Mark Brown <broonie@kernel.org>
| 2016-08-09 12:43:55 +0100 |
| commit | c958374f1cd22ec87f210985f9f9e1ba8b3df30b (patch) | |
| tree | d0e6a476881a34e5fcaf51b22afc1c2f35443fa3 /sound/soc/generic/simple-card.c | |
| parent | ASoC: simple-card-utils: add asoc_simple_card_canonicalize_dailink() (diff) | |
| download | linux-c958374f1cd22ec87f210985f9f9e1ba8b3df30b.tar.gz linux-c958374f1cd22ec87f210985f9f9e1ba8b3df30b.tar.bz2 linux-c958374f1cd22ec87f210985f9f9e1ba8b3df30b.zip | |
ASoC: simple-card: use asoc_simple_card_canonicalize_dailink()
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 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 03ecca85a724..8b1efdd2b115 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -286,14 +286,9 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, if (ret < 0) goto dai_link_of_err; - if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) { - ret = -EINVAL; + ret = asoc_simple_card_canonicalize_dailink(dai_link); + if (ret < 0) goto dai_link_of_err; - } - - /* Assumes platform == cpu */ - if (!dai_link->platform_of_node) - dai_link->platform_of_node = dai_link->cpu_of_node; ret = asoc_simple_card_set_dailink_name(dev, dai_link, "%s-%s", |