[PATCH 1/1] ASoC: soc-component: add snd_soc_component_ack()
Gyeongtaek Lee
gt82.lee at samsung.com
Fri Apr 3 04:19:43 CEST 2020
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_ack() and use it.
Ack callback is revived because some ASoC driver is using it.
Change-Id: I85573cb43f3ca050c47ca9e3af3cfa9ec1fae3d0
Signed-off-by: Gyeongtaek Lee <gt82.lee at samsung.com>
---
include/sound/soc-component.h | 1 +
sound/soc/soc-component.c | 18 ++++++++++++++++++
sound/soc/soc-pcm.c | 2 ++
3 files changed, 21 insertions(+)
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 5d80b2eef525..50b079272b47 100644
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -381,6 +381,7 @@ struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
unsigned long offset);
int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
struct vm_area_struct *vma);
+int snd_soc_pcm_component_ack(struct snd_pcm_substream *substream);
int snd_soc_pcm_component_new(struct snd_pcm *pcm);
void snd_soc_pcm_component_free(struct snd_pcm *pcm);
diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 79ffc2820ba9..b4be91cb9fa0 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -526,6 +526,24 @@ int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
return -EINVAL;
}
+int snd_soc_pcm_component_ack(struct snd_pcm_substream *substream)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_rtdcom_list *rtdcom;
+ struct snd_soc_component *component;
+
+ for_each_rtdcom(rtd, rtdcom) {
+ component = rtdcom->component;
+
+ /* FIXME. it returns 1st ack now */
+ if (component->driver->ops &&
+ component->driver->ops->ack)
+ return component->driver->ops->ack(substream);
+ }
+
+ return -EINVAL;
+}
+
int snd_soc_pcm_component_new(struct snd_pcm *pcm)
{
struct snd_soc_pcm_runtime *rtd = pcm->private_data;
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index b600d3eaaf5c..c8a5a9a9d35f 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2941,6 +2941,8 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
if (!ops)
continue;
+ if (ops->ack)
+ rtd->ops.ack = snd_soc_pcm_component_ack;
if (ops->copy_user)
rtd->ops.copy_user = snd_soc_pcm_component_copy_user;
if (ops->page)
--
2.21.0
More information about the Alsa-devel
mailing list