Unverified Commit 205875e1 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_pcm_component_mmap() 



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

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87muh14d02.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9c712e4f

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -379,5 +379,7 @@ int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream, 
				    void __user *buf, unsigned long bytes);

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);



#endif /* __SOC_COMPONENT_H */

sound/soc/soc-component.c

+19 −0
Original line number Diff line number Diff line
@@ -506,3 +506,22 @@ struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream, 


	return NULL;

}



int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,

			       struct vm_area_struct *vma)

{

	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 mmap now */

		if (component->driver->ops &&

		    component->driver->ops->mmap)

			return component->driver->ops->mmap(substream, vma);

	}



	return -EINVAL;

}

sound/soc/soc-pcm.c

+1 −22
Original line number Diff line number Diff line
@@ -2818,27 +2818,6 @@ static void soc_pcm_private_free(struct snd_pcm *pcm) 
	}

}



static int soc_rtdcom_mmap(struct snd_pcm_substream *substream,

			   struct vm_area_struct *vma)

{

	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->mmap)

			continue;



		/* FIXME. it returns 1st mmap now */

		return component->driver->ops->mmap(substream, vma);

	}



	return -EINVAL;

}



/* create a new pcm */

int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)

{
@@ -2968,7 +2947,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) 
		if (ops->page)

			rtd->ops.page		= snd_soc_pcm_component_page;

		if (ops->mmap)

			rtd->ops.mmap		= soc_rtdcom_mmap;

			rtd->ops.mmap		= snd_soc_pcm_component_mmap;

	}



	if (playback)

CRA Git | Maintained and supported by SUSTech CRA and CCSE