Unverified Commit 9c712e4f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_pcm_component_page() 



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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87o91h4d06.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -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 channel, unsigned long pos,

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

sound/soc/soc-component.c

+23 −0
Original line number Diff line number Diff line
@@ -483,3 +483,26 @@ int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream, 


	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;

}

sound/soc/soc-pcm.c

+1 −25
Original line number Diff line number Diff line
@@ -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,

			   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)

			rtd->ops.copy_user	= snd_soc_pcm_component_copy_user;

		if (ops->page)

			rtd->ops.page		= soc_rtdcom_page;

			rtd->ops.page		= snd_soc_pcm_component_page;

		if (ops->mmap)

			rtd->ops.mmap		= soc_rtdcom_mmap;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE