Commit 2610ab77 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: Refactor some conditions and loop in soc_bind_dai_link() 



Transform some loops from:

for_each(x) {
    if (f(x)) {
        work_on(x);
    }
}

to new structure:

for_each(x) {
    if (!f(x))
        continue;

    work_on(x);
}

This will allow future modification of f(x) with less impact to the code.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7b9b5e11

sound/soc/soc-core.c

+30 −22
Original line number Diff line number Diff line
@@ -763,11 +763,12 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num) 
	}

	/* no, then find CPU DAI from registered DAIs*/

	list_for_each_entry(cpu_dai, &dai_list, list) {

		if (!strcmp(cpu_dai->name, dai_link->cpu_dai_name)) {

		if (strcmp(cpu_dai->name, dai_link->cpu_dai_name))

			continue;



		rtd->cpu_dai = cpu_dai;

		goto find_codec;

	}

	}

	dev_dbg(card->dev, "CPU DAI %s not registered\n",

			dai_link->cpu_dai_name);
@@ -779,13 +780,20 @@ find_codec: 


	/* no, then find CODEC from registered CODECs*/

	list_for_each_entry(codec, &codec_list, list) {

		if (!strcmp(codec->name, dai_link->codec_name)) {

		if (strcmp(codec->name, dai_link->codec_name))

			continue;



		rtd->codec = codec;



			/* CODEC found, so find CODEC DAI from registered DAIs from this CODEC*/

		/*

		 * CODEC found, so find CODEC DAI from registered DAIs from

		 * this CODEC

		 */

		list_for_each_entry(codec_dai, &dai_list, list) {

			if (codec->dev == codec_dai->dev &&

						!strcmp(codec_dai->name, dai_link->codec_dai_name)) {

				!strcmp(codec_dai->name,

					dai_link->codec_dai_name)) {



				rtd->codec_dai = codec_dai;

				goto find_platform;

			}
@@ -795,7 +803,6 @@ find_codec: 


		goto find_platform;

	}

	}

	dev_dbg(card->dev, "CODEC %s not registered\n",

			dai_link->codec_name);
@@ -811,11 +818,12 @@ find_platform: 


	/* no, then find one from the set of registered platforms */

	list_for_each_entry(platform, &platform_list, list) {

		if (!strcmp(platform->name, platform_name)) {

		if (strcmp(platform->name, platform_name))

			continue;



		rtd->platform = platform;

		goto out;

	}

	}



	dev_dbg(card->dev, "platform %s not registered\n",

			dai_link->platform_name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE