Commit ce2d8ed8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ASoC: qcom: Convert to generic PCM copy ops 



This patch converts the qcom lpass driver code to use the new unified
PCM copy callback.  It's a straightforward conversion from *_user() to
*_iter() variants.

Note that copy_from/to_iter() returns the copied bytes, hence the
error condition is adjusted accordingly.

Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Banajit Goswami <bgoswami@quicinc.com>
Link: https://lore.kernel.org/r/20230815190136.8987-21-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 95396d83

sound/soc/qcom/lpass-platform.c

+7 −6
Original line number Diff line number Diff line
@@ -1219,7 +1219,8 @@ static int lpass_platform_pcmops_resume(struct snd_soc_component *component) 


static int lpass_platform_copy(struct snd_soc_component *component,

			       struct snd_pcm_substream *substream, int channel,

			       unsigned long pos, void __user *buf, unsigned long bytes)

			       unsigned long pos, struct iov_iter *buf,

			       unsigned long bytes)

{

	struct snd_pcm_runtime *rt = substream->runtime;

	unsigned int dai_id = component->id;
@@ -1230,16 +1231,16 @@ static int lpass_platform_copy(struct snd_soc_component *component, 


	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		if (is_cdc_dma_port(dai_id)) {

			ret = copy_from_user_toio(dma_buf, buf, bytes);

			ret = copy_from_iter_toio(dma_buf, buf, bytes);

		} else {

			if (copy_from_user((void __force *)dma_buf, buf, bytes))

			if (copy_from_iter((void __force *)dma_buf, bytes, buf) != bytes)

				ret = -EFAULT;

		}

	} else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {

		if (is_cdc_dma_port(dai_id)) {

			ret = copy_to_user_fromio(buf, dma_buf, bytes);

			ret = copy_to_iter_fromio(buf, dma_buf, bytes);

		} else {

			if (copy_to_user(buf, (void __force *)dma_buf, bytes))

			if (copy_to_iter((void __force *)dma_buf, bytes, buf) != bytes)

				ret = -EFAULT;

		}

	}
@@ -1260,7 +1261,7 @@ static const struct snd_soc_component_driver lpass_component_driver = { 
	.pcm_construct	= lpass_platform_pcm_new,

	.suspend		= lpass_platform_pcmops_suspend,

	.resume			= lpass_platform_pcmops_resume,

	.copy_user		= lpass_platform_copy,

	.copy		= lpass_platform_copy,



};