Skip to content

Commit

Permalink
ASoC: Refactor some conditions and loop in soc_bind_dai_link()
Browse files Browse the repository at this point in the history
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: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Stephen Warren authored and Mark Brown committed Dec 9, 2011
1 parent 7b9b5e1 commit 2610ab7
Showing 1 changed file with 30 additions and 22 deletions.
52 changes: 30 additions & 22 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -763,10 +763,11 @@ 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)) {
rtd->cpu_dai = cpu_dai;
goto find_codec;
}
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);
Expand All @@ -779,22 +780,28 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)

/* no, then find CODEC from registered CODECs*/
list_for_each_entry(codec, &codec_list, list) {
if (!strcmp(codec->name, dai_link->codec_name)) {
rtd->codec = 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)) {
rtd->codec_dai = codec_dai;
goto find_platform;
}
}
dev_dbg(card->dev, "CODEC DAI %s not registered\n",
dai_link->codec_dai_name);
if (strcmp(codec->name, dai_link->codec_name))
continue;

rtd->codec = codec;

goto find_platform;
/*
* 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)) {

rtd->codec_dai = codec_dai;
goto find_platform;
}
}
dev_dbg(card->dev, "CODEC DAI %s not registered\n",
dai_link->codec_dai_name);

goto find_platform;
}
dev_dbg(card->dev, "CODEC %s not registered\n",
dai_link->codec_name);
Expand All @@ -811,10 +818,11 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)

/* no, then find one from the set of registered platforms */
list_for_each_entry(platform, &platform_list, list) {
if (!strcmp(platform->name, platform_name)) {
rtd->platform = platform;
goto out;
}
if (strcmp(platform->name, platform_name))
continue;

rtd->platform = platform;
goto out;
}

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

0 comments on commit 2610ab7

Please sign in to comment.