leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: soc-core: avoid nested code on soc_remove_dai()

Browse Source 
Nested code is not readable.
This patch avoid it on soc_remove_dai().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-09-11 06:54:26 +00:00 committed by Mark Brown
parent a6ebf4c977
commit 2eda3cb108
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sound/soc/soc-core.c
View File

@ -942,17 +942,18 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order)
{
int err;
if (dai && dai->probed &&
dai->driver->remove_order == order) {
if (dai->driver->remove) {
err = dai->driver->remove(dai);
if (err < 0)
dev_err(dai->dev,
"ASoC: failed to remove %s: %d\n",
dai->name, err);
}
dai->probed = 0;
if (!dai || !dai->probed ||
dai->driver->remove_order != order)
return;
if (dai->driver->remove) {
err = dai->driver->remove(dai);
if (err < 0)
dev_err(dai->dev,
"ASoC: failed to remove %s: %d\n",
dai->name, err);
}
dai->probed = 0;
}
static void soc_remove_link_dais(struct snd_soc_card *card,