diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2019-01-21 09:32:50 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-01-21 18:13:33 +0000 |
commit | 52293596f5afff10d14e033aa3edfc801a31b3a1 (patch) | |
tree | 6b6240c8842e75c73aae16b15668940d8d8250da /sound/soc/soc-core.c | |
parent | 53e947a0e1f770b9707febb7054b856878945d50 (diff) | |
download | linux-52293596f5afff10d14e033aa3edfc801a31b3a1.tar.gz linux-52293596f5afff10d14e033aa3edfc801a31b3a1.tar.bz2 linux-52293596f5afff10d14e033aa3edfc801a31b3a1.zip |
ASoC: soc-core: reduce if/else nest on soc_probe_link_dais
Deep nested codec is not readable.
Let's reduce if/else nest.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r-- | sound/soc/soc-core.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d59b5ea9fa25..7fc10a41e0e9 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1612,27 +1612,24 @@ static int soc_probe_link_dais(struct snd_soc_card *card, dai_link->stream_name); return ret; } - } else { - - if (!dai_link->params) { - /* create the pcm */ - ret = soc_new_pcm(rtd, num); - if (ret < 0) { - dev_err(card->dev, "ASoC: can't create pcm %s :%d\n", - dai_link->stream_name, ret); - return ret; - } - ret = soc_link_dai_pcm_new(&cpu_dai, 1, rtd); - if (ret < 0) - return ret; - ret = soc_link_dai_pcm_new(rtd->codec_dais, - rtd->num_codecs, rtd); - if (ret < 0) - return ret; - } else { - INIT_DELAYED_WORK(&rtd->delayed_work, - codec2codec_close_delayed_work); + } else if (!dai_link->params) { + /* create the pcm */ + ret = soc_new_pcm(rtd, num); + if (ret < 0) { + dev_err(card->dev, "ASoC: can't create pcm %s :%d\n", + dai_link->stream_name, ret); + return ret; } + ret = soc_link_dai_pcm_new(&cpu_dai, 1, rtd); + if (ret < 0) + return ret; + ret = soc_link_dai_pcm_new(rtd->codec_dais, + rtd->num_codecs, rtd); + if (ret < 0) + return ret; + } else { + INIT_DELAYED_WORK(&rtd->delayed_work, + codec2codec_close_delayed_work); } return 0; |