diff options
| author |   Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2020-05-29 07:36:13 -0500 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-05-29 14:21:45 +0100 |
| commit | 28ff437a44fa618a14bc7402c7472b278af4c9eb (patch) | |
| tree | 2857d20d3f415bbea37d39d60607b85d60599c73 | |
| parent | Merge series "ASoC topology header parsing refinement" from Keyon Jie <yang.jie@linux.intel.com>: (diff) | |
| download | linux-dev-28ff437a44fa618a14bc7402c7472b278af4c9eb.tar.xz linux-dev-28ff437a44fa618a14bc7402c7472b278af4c9eb.zip | |
ASoC: reduce verbosity of error messages for sof-dai and sof-link
Recent changes result in multiple dmesg traces such as:
[ 14.410435] Audio Port: ASoC: error at snd_soc_link_startup on Audio
Port: 1
[ 14.410446] sst-mfld-platform sst-mfld-platform: ASoC: error at
snd_soc_dai_startup on media-cpu-dai: 1
These messages are not really errors, when dai and dai-link callbacks
return the value of e.g. snd_pcm_hw_constraint_single() the result is
"Positive if the value is changed, zero if it's not changed, or a
negative error code"
Add a simple test to skip the checks for positive returned values
Suggested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200529123613.13447-1-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/soc-dai.c | 6 | ||||
| -rw-r--r-- | sound/soc/soc-link.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 2c6ac3b0afa5..b05e18b63a1c 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -14,10 +14,14 @@ static inline int _soc_dai_ret(struct snd_soc_dai *dai, const char *func, int ret) { + /* Positive, Zero values are not errors */ + if (ret >= 0) + return ret; + + /* Negative values might be errors */ switch (ret) { case -EPROBE_DEFER: case -ENOTSUPP: - case 0: break; default: dev_err(dai->dev, diff --git a/sound/soc/soc-link.c b/sound/soc/soc-link.c index 248e1be4e1eb..f849278beba0 100644 --- a/sound/soc/soc-link.c +++ b/sound/soc/soc-link.c @@ -12,10 +12,14 @@ static inline int _soc_link_ret(struct snd_soc_pcm_runtime *rtd, const char *func, int ret) { + /* Positive, Zero values are not errors */ + if (ret >= 0) + return ret; + + /* Negative values might be errors */ switch (ret) { case -EPROBE_DEFER: case -ENOTSUPP: - case 0: break; default: dev_err(rtd->dev, |