ASoC: soc-core: tidyup ret handling for card->disable_route_checks

commit a22ae72b86a4 ("ASoC: soc-core: disable route checks for legacy
devices") added card->disable_route_checks to disable route checks
for legacy devices at soc_probe_component() and snd_soc_bind_card().

And commit 6974857c2b2c ("ASoC: topology: Do not ignore route checks
when parsing graphs") tidyup soc-topology for same reason.

In snd_soc_bind_card() case, if snd_soc_dapm_add_routes() (A) error,
but has card->disable_route_checks case (B), it will indicate
dev_info() only, and then, next function (C) will be called.
Thus, "ret" will be over written, and it is handled as non-error.

	static int snd_soc_bind_card(...)
	{
		...
(A)		ret = snd_soc_dapm_add_routes(...);
		if (ret < 0) {
(B)			if (card->disable_route_checks) {
				dev_info(...);
			} else {
				...
				goto probe_end;
			}
		}

(C)		ret = snd_soc_dapm_add_routes(...);
		...

In soc_probe_component() case, if snd_soc_dapm_add_routes() (a)
error, and has card->disable_route_checks case (b), it will indicate
dev_info(). But there is no next function after that, this means ret is
still indicating error, and will not be over written.
So error handline (c) will be handled, and will return error (d)

	static int soc_probe_component(...)
	{
		...
(a)		ret = snd_soc_dapm_add_routes(...);
		if (ret < 0) {
(b)			if (card->disable_route_checks) {
				dev_info(...);
			} else {
				...
				goto err_probe;
			}
		}

		/* see for_each_card_components */
		list_add(...);

	err_probe:
(c)		if (ret < 0)
			soc_remove_component(...);

(d)		return ret;
	}

In soc_tplg_dapm_graph_elems_load() case, snd_soc_dapm_add_routes()
is called in for loop (1). if it was error (2), and doesn't have
card->disable_route_checks case flag (3), it will break from loop.
If card has flag, it will indicate dev_info() and handled as non-error.
But ret is still indicating error in this case. If this error happen
in last of loop, if will return error (4).

	static int soc_tplg_dapm_graph_elems_load(...)
	{
		...
(1)		for (i = 0; i < count; i++) {
			...
(2)			ret = snd_soc_dapm_add_routes(...);
			if (ret) {
(3)				if (!dapm->card->disable_route_checks) {
					dev_err(...);
					break;
				}
				dev_info(...);
			}
		}

(4)		return ret;
	}

This patch set "ret = 0" for each case.

Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Cc: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87wmg5tzra.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a1dace4bb61664e7f2b4f17147be399077e2fe25..c8b7f78b02f0a13985f99f31b15b2cd257734018 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1646,6 +1646,7 @@ static int soc_probe_component(struct snd_soc_card *card,
                                      component->driver->num_dapm_routes);
        if (ret < 0) {
                if (card->disable_route_checks) {
+                       ret = 0;
                        dev_info(card->dev,
                                 "%s: disable_route_checks set, ignoring errors on add_routes\n",
                                 __func__);
@@ -2236,6 +2237,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
                                      card->num_dapm_routes);
        if (ret < 0) {
                if (card->disable_route_checks) {
+                       ret = 0;
                        dev_info(card->dev,
                                 "%s: disable_route_checks set, ignoring errors on add_routes\n",
                                 __func__);

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 43003d2d3666733673b7a63565a25c0f1af44165..ae2d6802cce0589f65f668e61856eb9edef26d17 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1102,12 +1102,14 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg,
 
                ret = snd_soc_dapm_add_routes(dapm, route, 1);
                if (ret) {
-                       if (!dapm->card->disable_route_checks) {
+                       if (dapm->card->disable_route_checks) {
+                               ret = 0;
+                               dev_info(tplg->dev,
+                                        "ASoC: disable_route_checks set, ignoring dapm_add_routes errors\n");
+                       } else {
                                dev_err(tplg->dev, "ASoC: dapm_add_routes failed: %d\n", ret);
                                break;
                        }
-                       dev_info(tplg->dev,
-                                "ASoC: disable_route_checks set, ignoring dapm_add_routes errors\n");
                }
        }