Skip to content

Commit

Permalink
ASoC: core: Upgrade the severity of probe deferral errors to dev_err()
Browse files Browse the repository at this point in the history
In the past when ASoC had a custom probe deferral mechanism people
complained about the logspam it generated and didn't want to know about
the fact that we were doing probe deferral so all the error messages for
it were at dev_dbg(), making diagnostics hard. Now that we have probe
deferral as an accepted thing and it's generating log messages anyway
there's no need to worry about this so upgrade the severity of all the
probe deferral sources to dev_err() so that they are displayed by default.

Also add one for missing aux_devs since there wasn't one.

Reported-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Aug 9, 2012
1 parent 1567693 commit fb099cb
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)
}

if (!rtd->cpu_dai) {
dev_dbg(card->dev, "CPU DAI %s not registered\n",
dev_err(card->dev, "CPU DAI %s not registered\n",
dai_link->cpu_dai_name);
return -EPROBE_DEFER;
}
Expand Down Expand Up @@ -857,14 +857,14 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)
}

if (!rtd->codec_dai) {
dev_dbg(card->dev, "CODEC DAI %s not registered\n",
dev_err(card->dev, "CODEC DAI %s not registered\n",
dai_link->codec_dai_name);
return -EPROBE_DEFER;
}
}

if (!rtd->codec) {
dev_dbg(card->dev, "CODEC %s not registered\n",
dev_err(card->dev, "CODEC %s not registered\n",
dai_link->codec_name);
return -EPROBE_DEFER;
}
Expand All @@ -888,7 +888,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)
rtd->platform = platform;
}
if (!rtd->platform) {
dev_dbg(card->dev, "platform %s not registered\n",
dev_err(card->dev, "platform %s not registered\n",
dai_link->platform_name);
return -EPROBE_DEFER;
}
Expand Down Expand Up @@ -1481,6 +1481,8 @@ static int soc_check_aux_dev(struct snd_soc_card *card, int num)
return 0;
}

dev_err(card->dev, "%s not registered\n", aux_dev->codec_name);

return -EPROBE_DEFER;
}

Expand Down

0 comments on commit fb099cb

Please sign in to comment.