Unverified Commit 96a47908 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-component: add snd_soc_pcm_component_ioctrl() 



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

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


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

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -372,5 +372,7 @@ int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component, 
					const char **dai_name);



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



#endif /* __SOC_COMPONENT_H */

sound/soc/soc-component.c

+20 −0
Original line number Diff line number Diff line
@@ -442,3 +442,23 @@ int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream) 


	return 0;

}



int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,

				unsigned int cmd, void *arg)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_component *component;

	struct snd_soc_rtdcom_list *rtdcom;



	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;



		/* FIXME: use 1st ioctl */

		if (component->driver->ops &&

		    component->driver->ops->ioctl)

			return component->driver->ops->ioctl(substream,

							     cmd, arg);

	}



	return snd_pcm_lib_ioctl(substream, cmd, arg);

}

sound/soc/soc-pcm.c

+2 −23
Original line number Diff line number Diff line
@@ -2453,27 +2453,6 @@ out: 
	return ret;

}



static int soc_pcm_ioctl(struct snd_pcm_substream *substream,

		     unsigned int cmd, void *arg)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_component *component;

	struct snd_soc_rtdcom_list *rtdcom;



	for_each_rtdcom(rtd, rtdcom) {

		component = rtdcom->component;



		if (!component->driver->ops ||

		    !component->driver->ops->ioctl)

			continue;



		/* FIXME: use 1st ioctl */

		return component->driver->ops->ioctl(substream, cmd, arg);

	}



	return snd_pcm_lib_ioctl(substream, cmd, arg);

}



static int dpcm_run_update_shutdown(struct snd_soc_pcm_runtime *fe, int stream)

{

	struct snd_pcm_substream *substream =
@@ -3013,7 +2992,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) 
		rtd->ops.hw_free	= dpcm_fe_dai_hw_free;

		rtd->ops.close		= dpcm_fe_dai_close;

		rtd->ops.pointer	= soc_pcm_pointer;

		rtd->ops.ioctl		= soc_pcm_ioctl;

		rtd->ops.ioctl		= snd_soc_pcm_component_ioctl;

	} else {

		rtd->ops.open		= soc_pcm_open;

		rtd->ops.hw_params	= soc_pcm_hw_params;
@@ -3022,7 +3001,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) 
		rtd->ops.hw_free	= soc_pcm_hw_free;

		rtd->ops.close		= soc_pcm_close;

		rtd->ops.pointer	= soc_pcm_pointer;

		rtd->ops.ioctl		= soc_pcm_ioctl;

		rtd->ops.ioctl		= snd_soc_pcm_component_ioctl;

	}



	for_each_rtdcom(rtd, rtdcom) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE