ASoC: soc-core: tidyup soc_probe_aux_devices() (74bd3f92) · Commits · 戴 / test

snd_soc_bind_card() is calling many initialize functions for each card / link / dai / aux etc, etc, etc... When error happen, the message is indicated at snd_soc_bind_card(), not at each functions. But, only soc_probe_aux_devices() case is indicating error at functions, not at snd_soc_bind_card(). It is not an issue, but unbalanced. This patch moves error message to snd_soc_bind_card(). Also avoids deep-nested code. Signed-off-by:

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://lore.kernel.org/r/87lfsthkw9.wl-kuninori.morimoto.gx@renesas.com Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/soc-core.c

+12 −12

Original line number	Diff line number	Diff line
		@@ -1579,23 +1579,20 @@ static int soc_bind_aux_dev(struct snd_soc_card *card)

		static int soc_probe_aux_devices(struct snd_soc_card *card)
		{
		struct snd_soc_component *comp;
		struct snd_soc_component *component;
		int order;
		int ret;

		for_each_comp_order(order) {
		for_each_card_auxs(card, comp) {
		if (comp->driver->probe_order == order) {
		ret = soc_probe_component(card, comp);
		if (ret < 0) {
		dev_err(card->dev,
		"ASoC: failed to probe aux component %s %d\n",
		comp->name, ret);
		for_each_card_auxs(card, component) {
		if (component->driver->probe_order != order)
		continue;

		ret = soc_probe_component(card, component);
		if (ret < 0)
		return ret;
		}
		}
		}
		}

		return 0;
		}
		@@ -2042,8 +2039,11 @@ static int snd_soc_bind_card(struct snd_soc_card *card)

		/* probe auxiliary components */
		ret = soc_probe_aux_devices(card);
		if (ret < 0)
		if (ret < 0) {
		dev_err(card->dev,
		"ASoC: failed to probe aux component %d\n", ret);
		goto probe_end;
		}

		/* probe all DAI links on this card */
		ret = soc_probe_link_dais(card);

Admin message