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

ASoC: soc-component: add snd_soc_component_trigger()

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_trigger() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/878ssl5rn5.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:29 +09:00 committed by Mark Brown
parent eae7136aa2
commit 5693d50c83
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,5 +350,8 @@ int snd_soc_component_hw_params(struct snd_soc_component *component,
struct snd_pcm_hw_params *params); struct snd_pcm_hw_params *params);
int snd_soc_component_hw_free(struct snd_soc_component *component, int snd_soc_component_hw_free(struct snd_soc_component *component,
struct snd_pcm_substream *substream); struct snd_pcm_substream *substream);
int snd_soc_component_trigger(struct snd_soc_component *component,
struct snd_pcm_substream *substream,
int cmd);
#endif /* __SOC_COMPONENT_H */ #endif /* __SOC_COMPONENT_H */

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

@ -336,3 +336,14 @@ int snd_soc_component_hw_free(struct snd_soc_component *component,
return 0; return 0;
} }
int snd_soc_component_trigger(struct snd_soc_component *component,
struct snd_pcm_substream *substream,
int cmd)
{
if (component->driver->ops &&
component->driver->ops->trigger)
return component->driver->ops->trigger(substream, cmd);
return 0;
}

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

@ -1065,11 +1065,7 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
for_each_rtdcom(rtd, rtdcom) { for_each_rtdcom(rtd, rtdcom) {
component = rtdcom->component; component = rtdcom->component;
if (!component->driver->ops || ret = snd_soc_component_trigger(component, substream, cmd);
!component->driver->ops->trigger)
continue;
ret = component->driver->ops->trigger(substream, cmd);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }