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

ASoC: soc-component: add snd_soc_component_compr_copy() 



component related function should be implemented at
soc-component.c.
This patch adds snd_soc_component_compr_copy().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87361d7v5z.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -460,6 +460,8 @@ int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream, 
int snd_soc_component_compr_ack(struct snd_compr_stream *cstream, size_t bytes);

int snd_soc_component_compr_pointer(struct snd_compr_stream *cstream,

				    struct snd_compr_tstamp *tstamp);

int snd_soc_component_compr_copy(struct snd_compr_stream *cstream,

				 char __user *buf, size_t count);



int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream);

int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,

sound/soc/soc-component.c

+24 −0
Original line number Diff line number Diff line
@@ -611,6 +611,30 @@ int snd_soc_component_compr_pointer(struct snd_compr_stream *cstream, 
}

EXPORT_SYMBOL_GPL(snd_soc_component_compr_pointer);



int snd_soc_component_compr_copy(struct snd_compr_stream *cstream,

				 char __user *buf, size_t count)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_component *component;

	int i, ret = 0;



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);



	for_each_rtd_components(rtd, i, component) {

		if (component->driver->compress_ops &&

		    component->driver->compress_ops->copy) {

			ret = component->driver->compress_ops->copy(

				component, cstream, buf, count);

			break;

		}

	}



	mutex_unlock(&rtd->card->pcm_mutex);



	return soc_component_ret(component, ret);

}

EXPORT_SYMBOL_GPL(snd_soc_component_compr_copy);



static unsigned int soc_component_read_no_lock(

	struct snd_soc_component *component,

	unsigned int reg)

sound/soc/soc-compress.c

+1 −24
Original line number Diff line number Diff line
@@ -446,29 +446,6 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, 
	return ret;

}



static int soc_compr_copy(struct snd_compr_stream *cstream,

			  char __user *buf, size_t count)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_component *component;

	int i, ret = 0;



	mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);



	for_each_rtd_components(rtd, i, component) {

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

		    !component->driver->compress_ops->copy)

			continue;



		ret = component->driver->compress_ops->copy(

			component, cstream, buf, count);

		break;

	}



	mutex_unlock(&rtd->card->pcm_mutex);

	return ret;

}



static int soc_compr_set_metadata(struct snd_compr_stream *cstream,

				  struct snd_compr_metadata *metadata)

{
@@ -649,7 +626,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
		    !component->driver->compress_ops->copy)

			continue;



		compr->ops->copy = soc_compr_copy;

		compr->ops->copy = snd_soc_component_compr_copy;

		break;

	}