iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: soc-component: add snd_soc_component_prepare()

Browse Source 
Current ALSA SoC is directly using component->driver->ops->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_prepare() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87d0hx5rnm.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:50:13 +09:00
committed by Mark Brown
parent 3672beb8ca
commit 6d53723380
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,5 +343,7 @@ int snd_soc_component_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);
int snd_soc_component_close(struct snd_soc_component *component, int snd_soc_component_close(struct snd_soc_component *component,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);
int snd_soc_component_prepare(struct snd_soc_component *component,
struct snd_pcm_substream *substream);
#endif /* __SOC_COMPONENT_H */ #endif /* __SOC_COMPONENT_H */

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

@ -305,3 +305,13 @@ int snd_soc_component_close(struct snd_soc_component *component,
return 0; return 0;
} }
int snd_soc_component_prepare(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{
if (component->driver->ops &&
component->driver->ops->prepare)
return component->driver->ops->prepare(substream);
return 0;
}

6
sound/soc/soc-pcm.c
View File

@ -785,11 +785,7 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
for_each_rtdcom(rtd, rtdcom) { for_each_rtdcom(rtd, rtdcom) {
component = rtdcom->component; component = rtdcom->component;
if (!component->driver->ops || ret = snd_soc_component_prepare(component, substream);
!component->driver->ops->prepare)
continue;
ret = component->driver->ops->prepare(substream);
if (ret < 0) { if (ret < 0) {
dev_err(component->dev, dev_err(component->dev,
"ASoC: platform prepare error: %d\n", ret); "ASoC: platform prepare error: %d\n", ret);