Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7a2ccad5 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-core: soc_probe_dai() code simplification 



Current soc_probe_dai() is using deep nested condition.
Thus, it is difficult to read/understand.
This patch simplification it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6b490879

sound/soc/soc-core.c

+11 −12
Original line number Diff line number Diff line
@@ -1624,21 +1624,20 @@ static int soc_probe_link_components(struct snd_soc_card *card, 


static int soc_probe_dai(struct snd_soc_dai *dai, int order)

{

	int ret;

	if (dai->probed ||

	    dai->driver->probe_order != order)

		return 0;



	if (!dai->probed && dai->driver->probe_order == order) {

	if (dai->driver->probe) {

			ret = dai->driver->probe(dai);

		int ret = dai->driver->probe(dai);

		if (ret < 0) {

				dev_err(dai->dev,

					"ASoC: failed to probe DAI %s: %d\n",

			dev_err(dai->dev, "ASoC: failed to probe DAI %s: %d\n",

				dai->name, ret);

			return ret;

		}

	}



	dai->probed = 1;

	}



	return 0;

}