ASoC: qcom: common: Avoid printing errors for -EPROBE_DEFER
authorStephan Gerhold <stephan@gerhold.net>
Thu, 23 Jul 2020 18:39:04 +0000 (20:39 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 24 Jul 2020 14:01:20 +0000 (15:01 +0100)
qcom_snd_parse_of() tends to produce lots of error messages during bootup:

MultiMedia1: error getting cpu dai name

This happens because the DAIs are not probed until the ADSP remoteproc
has booted, which takes a while. Until it is ready, snd_soc_of_get_dai_name()
returns -EDEFER_PROBE to retry probing later. This is perfectly normal,
so cleanup the kernel log a bit by not printing in case of -EPROBE_DEFER.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200723183904.321040-8-stephan@gerhold.net
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/common.c

index 84dba0d..5194d90 100644 (file)
@@ -88,7 +88,9 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
 
                ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name);
                if (ret) {
-                       dev_err(card->dev, "%s: error getting cpu dai name\n", link->name);
+                       if (ret != -EPROBE_DEFER)
+                               dev_err(card->dev, "%s: error getting cpu dai name: %d\n",
+                                       link->name, ret);
                        goto err;
                }
 
@@ -108,7 +110,9 @@ int qcom_snd_parse_of(struct snd_soc_card *card)
                if (codec) {
                        ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
                        if (ret < 0) {
-                               dev_err(card->dev, "%s: codec dai not found\n", link->name);
+                               if (ret != -EPROBE_DEFER)
+                                       dev_err(card->dev, "%s: codec dai not found: %d\n",
+                                               link->name, ret);
                                goto err;
                        }