summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2019-07-26 00:50:29 -0400
committerMark Brown <broonie@kernel.org>2019-08-05 11:19:49 -0400
commit5693d50c830272cb3c4a04d2ce4db502debd1259 (patch)
treefff0edd0d87239320581598b10c2b8ef18cf8888 /sound/soc
parenteae7136aa2083699c69de5890fd6c32c501952b5 (diff)
ASoC: soc-component: add snd_soc_component_trigger()
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-component.c11
-rw-r--r--sound/soc/soc-pcm.c6
2 files changed, 12 insertions, 5 deletions
diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index e2bc34efe547..cf0d20a877e6 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -336,3 +336,14 @@ int snd_soc_component_hw_free(struct snd_soc_component *component,
336 336
337 return 0; 337 return 0;
338} 338}
339
340int snd_soc_component_trigger(struct snd_soc_component *component,
341 struct snd_pcm_substream *substream,
342 int cmd)
343{
344 if (component->driver->ops &&
345 component->driver->ops->trigger)
346 return component->driver->ops->trigger(substream, cmd);
347
348 return 0;
349}
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 8c5289904f20..cd49c2d688c3 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1065,11 +1065,7 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
1065 for_each_rtdcom(rtd, rtdcom) { 1065 for_each_rtdcom(rtd, rtdcom) {
1066 component = rtdcom->component; 1066 component = rtdcom->component;
1067 1067
1068 if (!component->driver->ops || 1068 ret = snd_soc_component_trigger(component, substream, cmd);
1069 !component->driver->ops->trigger)
1070 continue;
1071
1072 ret = component->driver->ops->trigger(substream, cmd);
1073 if (ret < 0) 1069 if (ret < 0)
1074 return ret; 1070 return ret;
1075 } 1071 }