p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/8736it5rlt.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-07-26 13:51:17 +09:00 committed by Mark Brown
parent e40fadbcef
commit 08e837dd9e
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc-component.h
View File

@ -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_suspend(struct snd_soc_component *component);
void snd_soc_component_resume(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_is_suspended(struct snd_soc_component *component);
int snd_soc_component_probe(struct snd_soc_component *component);
#endif /* __SOC_COMPONENT_H */ #endif /* __SOC_COMPONENT_H */

8
sound/soc/soc-component.c
View File

@ -366,3 +366,11 @@ int snd_soc_component_is_suspended(struct snd_soc_component *component)
{ {
return component->suspended; return component->suspended;
} }
int snd_soc_component_probe(struct snd_soc_component *component)
{
if (component->driver->probe)
return component->driver->probe(component);
return 0;
}

12
sound/soc/soc-core.c
View File

@ -1282,13 +1282,11 @@ static int soc_probe_component(struct snd_soc_card *card,
} }
} }
if (component->driver->probe) { ret = snd_soc_component_probe(component);
ret = component->driver->probe(component); if (ret < 0) {
if (ret < 0) { dev_err(component->dev,
dev_err(component->dev, "ASoC: failed to probe component %d\n", ret);
"ASoC: failed to probe component %d\n", ret); goto err_probe;
goto err_probe;
}
} }
WARN(dapm->idle_bias_off && WARN(dapm->idle_bias_off &&
dapm->bias_level != SND_SOC_BIAS_OFF, dapm->bias_level != SND_SOC_BIAS_OFF,