Commit 52293596 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 53e947a0
...@@ -1612,27 +1612,24 @@ static int soc_probe_link_dais(struct snd_soc_card *card, ...@@ -1612,27 +1612,24 @@ static int soc_probe_link_dais(struct snd_soc_card *card,
dai_link->stream_name); dai_link->stream_name);
return ret; return ret;
} }
} else { } else if (!dai_link->params) {
/* create the pcm */
if (!dai_link->params) { ret = soc_new_pcm(rtd, num);
/* create the pcm */ if (ret < 0) {
ret = soc_new_pcm(rtd, num); dev_err(card->dev, "ASoC: can't create pcm %s :%d\n",
if (ret < 0) { dai_link->stream_name, ret);
dev_err(card->dev, "ASoC: can't create pcm %s :%d\n", return ret;
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);
} }
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; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment