Unverified Commit b6c3bdda authored Jul 05, 2023 by Johan Hovold Committed by Mark Brown Jul 06, 2023

ASoC: topology: suppress probe deferral errors



Suppress probe deferral error messages when loading topologies and
creating frontend links to avoid spamming the logs when a component has
not yet been registered:

    snd-sc8280xp sound: ASoC: adding FE link failed
    snd-sc8280xp sound: ASoC: topology: could not load header: -517

Note that dev_err_probe() is not used as the topology component can be
probed and removed while the underlying platform device remains bound to
its driver.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230705123018.30903-8-johan+linaro@kernel.org


Signed-off-by: Mark Brown <broonie@kernel.org>

parent a5475829

sound/soc/soc-topology.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -1732,6 +1732,7 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,

		ret = snd_soc_add_pcm_runtimes(tplg->comp->card, link, 1);
		if (ret < 0) {
		if (ret != -EPROBE_DEFER)
		dev_err(tplg->dev, "ASoC: adding FE link failed\n");
		goto err;
		}
		@@ -2492,8 +2493,11 @@ static int soc_tplg_process_headers(struct soc_tplg *tplg)
		/* load the header object */
		ret = soc_tplg_load_header(tplg, hdr);
		if (ret < 0) {
		if (ret != -EPROBE_DEFER) {
		dev_err(tplg->dev,
		"ASoC: topology: could not load header: %d\n", ret);
		"ASoC: topology: could not load header: %d\n",
		ret);
		}
		return ret;
		}