diff options
| author | Mark Brown <broonie@kernel.org> | 2020-06-15 20:58:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-15 20:58:46 +0100 |
| commit | 674b928986688e5076bcab4fbe2175fd7021ea0b (patch) | |
| tree | 2aee2a1041f5c541dec3f6fefcd9ca278f7a4135 | |
| parent | c42d8c17a9523a4f28b6f6be3920a6674e50c5d3 (diff) | |
| parent | 1d5cd5254f67bc65622f4cac04c25d6e082f21b0 (diff) | |
Merge series "ASoC: improve core dmesg logs and verbosity" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
Try to both reduce useless verbosity and keep useful error reports.
Pierre-Louis Bossart (3):
ASoC: soc-core: reduce verbosity of BE override message
ASoC: soc-pcm: improve error messages in soc_pcm_new()
ASoC: soc-pcm/compress: reduce verbosity on mapping ok messages
sound/soc/soc-compress.c | 4 ++--
sound/soc/soc-core.c | 4 ++--
sound/soc/soc-pcm.c | 13 +++++++------
3 files changed, 11 insertions(+), 10 deletions(-)
--
2.20.1
| -rw-r--r-- | sound/soc/soc-compress.c | 4 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 4 | ||||
| -rw-r--r-- | sound/soc/soc-pcm.c | 13 |
3 files changed, 11 insertions, 10 deletions
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 4984b6a2c370..415510909a82 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -867,8 +867,8 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) rtd->compr = compr; compr->private_data = rtd; - dev_info(rtd->card->dev, "Compress ASoC: %s <-> %s mapping ok\n", - codec_dai->name, cpu_dai->name); + dev_dbg(rtd->card->dev, "Compress ASoC: %s <-> %s mapping ok\n", + codec_dai->name, cpu_dai->name); return 0; } diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c38bb423e695..62c0c9482018 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1639,8 +1639,8 @@ match: continue; } - dev_info(card->dev, "info: override BE DAI link %s\n", - card->dai_link[i].name); + dev_dbg(card->dev, "info: override BE DAI link %s\n", + card->dai_link[i].name); /* override platform component */ if (!dai_link->platforms) { diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 9be6c282d80e..6dc21b6693bd 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2831,8 +2831,8 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) capture, &pcm); } if (ret < 0) { - dev_err(rtd->card->dev, "ASoC: can't create pcm for %s\n", - rtd->dai_link->name); + dev_err(rtd->card->dev, "ASoC: can't create pcm %s for dailink %s: %d\n", + new_name, rtd->dai_link->name, ret); return ret; } dev_dbg(rtd->card->dev, "ASoC: registered pcm #%d %s\n",num, new_name); @@ -2897,15 +2897,16 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) ret = snd_soc_pcm_component_new(rtd); if (ret < 0) { - dev_err(rtd->dev, "ASoC: pcm constructor failed: %d\n", ret); + dev_err(rtd->dev, "ASoC: pcm %s constructor failed for dailink %s: %d\n", + new_name, rtd->dai_link->name, ret); return ret; } pcm->no_device_suspend = true; out: - dev_info(rtd->card->dev, "%s <-> %s mapping ok\n", - (rtd->num_codecs > 1) ? "multicodec" : asoc_rtd_to_codec(rtd, 0)->name, - (rtd->num_cpus > 1) ? "multicpu" : asoc_rtd_to_cpu(rtd, 0)->name); + dev_dbg(rtd->card->dev, "%s <-> %s mapping ok\n", + (rtd->num_codecs > 1) ? "multicodec" : asoc_rtd_to_codec(rtd, 0)->name, + (rtd->num_cpus > 1) ? "multicpu" : asoc_rtd_to_cpu(rtd, 0)->name); return ret; } |