From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
Nested code is not readable. This patch avoid it on soc_remove_dai().
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/soc-core.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c8c73c6..41fef33 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -938,17 +938,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,