diff options
| author | Kuninori Morimoto | 2018-09-11 08:54:26 +0200 |
|---|---|---|
| committer | Mark Brown | 2018-09-11 18:18:23 +0200 |
| commit | 2eda3cb108b699a6ff78a87e25143c153bc88e41 (patch) | |
| tree | abf89ed271958f469c7f80d157ad5759db352480 /sound/soc/soc-core.c | |
| parent | ASoC: rt5668: remove empty rt5668_i2c_remove() (diff) | |
| download | kernel-qcow2-linux-2eda3cb108b699a6ff78a87e25143c153bc88e41.tar.gz kernel-qcow2-linux-2eda3cb108b699a6ff78a87e25143c153bc88e41.tar.xz kernel-qcow2-linux-2eda3cb108b699a6ff78a87e25143c153bc88e41.zip | |
ASoC: soc-core: avoid nested code on soc_remove_dai()
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>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4e9367aacc0c..dde9b70b58b5 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -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, |