Unverified Commit 2eda3cb1 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a6ebf4c9

sound/soc/soc-core.c

+11 −10
Original line number Original line Diff line number Diff line
@@ -942,8 +942,10 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order) 
{

{

	int err;

	int err;





	if (dai && dai->probed &&

	if (!dai || !dai->probed ||

			dai->driver->remove_order == order) {

	    dai->driver->remove_order != order)

		return;



	if (dai->driver->remove) {

	if (dai->driver->remove) {

		err = dai->driver->remove(dai);

		err = dai->driver->remove(dai);

		if (err < 0)

		if (err < 0)
@@ -953,7 +955,6 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order) 
	}

	}

	dai->probed = 0;

	dai->probed = 0;

}

}

}





static void soc_remove_link_dais(struct snd_soc_card *card,

static void soc_remove_link_dais(struct snd_soc_card *card,

		struct snd_soc_pcm_runtime *rtd, int order)

		struct snd_soc_pcm_runtime *rtd, int order)

CRA Git | Maintained and supported by SUSTech CRA and CCSE