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

ASoC: soc-component: add snd_soc_pcm_component_page()

Browse Source 
Current ALSA SoC is directly using component->driver->ops->xxx,
thus, the code nested deeply, and it makes code difficult to read,
and is not good for encapsulation.

We want to implement component related function at soc-component.c,
but, some of them need to care whole snd_soc_pcm_runtime (= rtd)
connected component.

Let's call component related function which need to care with
for_each_rtdcom() loop as snd_soc_pcm_component_xxx().
This patch adds new snd_soc_pcm_component_page() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87o91h4d06.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:52:00 +09:00 committed by Mark Brown
parent 82d81f5cce
commit 9c712e4f57
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,5 +377,7 @@ int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,
int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream, int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
int channel, unsigned long pos, int channel, unsigned long pos,
void __user *buf, unsigned long bytes); void __user *buf, unsigned long bytes);
struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
unsigned long offset);
#endif /* __SOC_COMPONENT_H */ #endif /* __SOC_COMPONENT_H */

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

@ -483,3 +483,26 @@ int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
unsigned long offset)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_rtdcom_list *rtdcom;
struct snd_soc_component *component;
struct page *page;
for_each_rtdcom(rtd, rtdcom) {
component = rtdcom->component;
/* FIXME. it returns 1st page now */
if (component->driver->ops &&
component->driver->ops->page) {
page = component->driver->ops->page(substream, offset);
if (page)
return page;
}
}
return NULL;
}

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

@ -2818,30 +2818,6 @@ static void soc_pcm_private_free(struct snd_pcm *pcm)
} }
} }
static struct page *soc_rtdcom_page(struct snd_pcm_substream *substream,
unsigned long offset)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_rtdcom_list *rtdcom;
struct snd_soc_component *component;
struct page *page;
for_each_rtdcom(rtd, rtdcom) {
component = rtdcom->component;
if (!component->driver->ops ||
!component->driver->ops->page)
continue;
/* FIXME. it returns 1st page now */
page = component->driver->ops->page(substream, offset);
if (page)
return page;
}
return NULL;
}
static int soc_rtdcom_mmap(struct snd_pcm_substream *substream, static int soc_rtdcom_mmap(struct snd_pcm_substream *substream,
struct vm_area_struct *vma) struct vm_area_struct *vma)
{ {
@ -2990,7 +2966,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
if (ops->copy_user) if (ops->copy_user)
rtd->ops.copy_user = snd_soc_pcm_component_copy_user; rtd->ops.copy_user = snd_soc_pcm_component_copy_user;
if (ops->page) if (ops->page)
rtd->ops.page = soc_rtdcom_page; rtd->ops.page = snd_soc_pcm_component_page;
if (ops->mmap) if (ops->mmap)
rtd->ops.mmap = soc_rtdcom_mmap; rtd->ops.mmap = soc_rtdcom_mmap;
} }