redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: soc-component: add snd_soc_pcm_component_copy_user() 

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87pnlx4d0a.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
alistair/sunxi64-5.4-dsi
Kuninori Morimoto 2019-07-26 13:51:56 +09:00 committed by Mark Brown
parent 96a47908d8
commit 82d81f5cce
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -374,5 +374,8 @@ int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream);
int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,
unsigned int cmd, void *arg);
int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
int channel, unsigned long pos,
void __user *buf, unsigned long bytes);
#endif /* __SOC_COMPONENT_H */

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

@ -462,3 +462,24 @@ int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,
return snd_pcm_lib_ioctl(substream, cmd, arg);
}
int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
int channel, unsigned long pos,
void __user *buf, unsigned long bytes)
{
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 copy now */
if (component->driver->ops &&
component->driver->ops->copy_user)
return component->driver->ops->copy_user(
substream, channel, pos, buf, bytes);
}
return -EINVAL;
}

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

@ -2818,29 +2818,6 @@ static void soc_pcm_private_free(struct snd_pcm *pcm)
}
}
static int soc_rtdcom_copy_user(struct snd_pcm_substream *substream, int channel,
unsigned long pos, void __user *buf,
unsigned long bytes)
{
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;
if (!component->driver->ops ||
!component->driver->ops->copy_user)
continue;
/* FIXME. it returns 1st copy now */
return component->driver->ops->copy_user(substream, channel,
pos, buf, bytes);
}
return -EINVAL;
}
static struct page *soc_rtdcom_page(struct snd_pcm_substream *substream,
unsigned long offset)
{
@ -3011,7 +2988,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
continue;
if (ops->copy_user)
rtd->ops.copy_user = soc_rtdcom_copy_user;
rtd->ops.copy_user = snd_soc_pcm_component_copy_user;
if (ops->page)
rtd->ops.page = soc_rtdcom_page;
if (ops->mmap)