Unverified Commit 08e837dd authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_component_probe() 



Current ALSA SoC is directly using component->driver->xxx,
thus, it is deep nested, and makes code difficult to read,
and is not good for encapsulation.
This patch adds new snd_soc_component_probe() and use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/8736it5rlt.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e40fadbc

include/sound/soc-component.h

+1 −0
Original line number Diff line number Diff line
@@ -356,5 +356,6 @@ int snd_soc_component_trigger(struct snd_soc_component *component, 
void snd_soc_component_suspend(struct snd_soc_component *component);

void snd_soc_component_resume(struct snd_soc_component *component);

int snd_soc_component_is_suspended(struct snd_soc_component *component);

int snd_soc_component_probe(struct snd_soc_component *component);



#endif /* __SOC_COMPONENT_H */

sound/soc/soc-component.c

+8 −0
Original line number Diff line number Diff line
@@ -366,3 +366,11 @@ int snd_soc_component_is_suspended(struct snd_soc_component *component) 
{

	return component->suspended;

}



int snd_soc_component_probe(struct snd_soc_component *component)

{

	if (component->driver->probe)

		return component->driver->probe(component);



	return 0;

}

sound/soc/soc-core.c

+5 −7
Original line number Diff line number Diff line
@@ -1282,14 +1282,12 @@ static int soc_probe_component(struct snd_soc_card *card, 
		}

	}



	if (component->driver->probe) {

		ret = component->driver->probe(component);

	ret = snd_soc_component_probe(component);

	if (ret < 0) {

		dev_err(component->dev,

			"ASoC: failed to probe component %d\n", ret);

		goto err_probe;

	}

	}

	WARN(dapm->idle_bias_off &&

	     dapm->bias_level != SND_SOC_BIAS_OFF,

	     "codec %s can not start from non-off bias with idle_bias_off==1\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE