From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
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: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- include/sound/soc-component.h | 1 + sound/soc/soc-component.c | 7 +++++++ sound/soc/soc-core.c | 12 +++++------- 3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h index 63e47cd..d01f36a 100644 --- a/include/sound/soc-component.h +++ b/include/sound/soc-component.h @@ -359,5 +359,6 @@ void snd_soc_component_pcm_free(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 */ diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c index fbb7493..2e7f254 100644 --- a/sound/soc/soc-component.c +++ b/sound/soc/soc-component.c @@ -438,3 +438,10 @@ 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; +} diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 6283b17d..9be12ae 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1323,13 +1323,11 @@ static int soc_probe_component(struct snd_soc_card *card, } }
- if (component->driver->probe) { - ret = component->driver->probe(component); - if (ret < 0) { - dev_err(component->dev, - "ASoC: failed to probe component %d\n", ret); - goto err_probe; - } + 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,