Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: es1938: Convert to generic PCM copy ops

Browse Source 
This patch converts the es1938 driver code to use the new unified PCM
copy callback.  It's a straightforward conversion from *_user() to
*_iter() variants in most parts.

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

Link: https://lore.kernel.org/r/20230815190136.8987-8-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2023-08-15 21:01:18 +02:00
parent 9d0fdc602d
commit 07ee02a2e1
1 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sound/pci/es1938.c
View File

@ -824,7 +824,7 @@ static snd_pcm_uframes_t snd_es1938_playback_pointer(struct snd_pcm_substream *s
static int snd_es1938_capture_copy(struct snd_pcm_substream *substream, static int snd_es1938_capture_copy(struct snd_pcm_substream *substream,
int channel, unsigned long pos, int channel, unsigned long pos,
void __user *dst, unsigned long count) struct iov_iter *dst, unsigned long count)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct es1938 *chip = snd_pcm_substream_chip(substream); struct es1938 *chip = snd_pcm_substream_chip(substream);
@ -832,36 +832,17 @@ static int snd_es1938_capture_copy(struct snd_pcm_substream *substream,
if (snd_BUG_ON(pos + count > chip->dma1_size)) if (snd_BUG_ON(pos + count > chip->dma1_size))
return -EINVAL; return -EINVAL;
if (pos + count < chip->dma1_size) { if (pos + count < chip->dma1_size) {
if (copy_to_user(dst, runtime->dma_area + pos + 1, count)) if (copy_to_iter(runtime->dma_area + pos + 1, count, dst) != count)
return -EFAULT; return -EFAULT;
} else { } else {
if (copy_to_user(dst, runtime->dma_area + pos + 1, count - 1)) if (copy_to_iter(runtime->dma_area + pos + 1, count - 1, dst) != count - 1)
return -EFAULT; return -EFAULT;
if (put_user(runtime->dma_area[0], if (copy_to_iter(runtime->dma_area, 1, dst) != 1)
((unsigned char __user *)dst) + count - 1))
return -EFAULT; return -EFAULT;
} }
return 0; return 0;
} }
static int snd_es1938_capture_copy_kernel(struct snd_pcm_substream *substream,
int channel, unsigned long pos,
void *dst, unsigned long count)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct es1938 *chip = snd_pcm_substream_chip(substream);
if (snd_BUG_ON(pos + count > chip->dma1_size))
return -EINVAL;
if (pos + count < chip->dma1_size) {
memcpy(dst, runtime->dma_area + pos + 1, count);
} else {
memcpy(dst, runtime->dma_area + pos + 1, count - 1);
runtime->dma_area[0] = *((unsigned char *)dst + count - 1);
}
return 0;
}
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* Audio1 Capture (ADC) * Audio1 Capture (ADC)
* ----------------------------------------------------------------------*/ * ----------------------------------------------------------------------*/
@ -987,8 +968,7 @@ static const struct snd_pcm_ops snd_es1938_capture_ops = {
.prepare = snd_es1938_capture_prepare, .prepare = snd_es1938_capture_prepare,
.trigger = snd_es1938_capture_trigger, .trigger = snd_es1938_capture_trigger,
.pointer = snd_es1938_capture_pointer, .pointer = snd_es1938_capture_pointer,
.copy_user = snd_es1938_capture_copy, .copy = snd_es1938_capture_copy,
.copy_kernel = snd_es1938_capture_copy_kernel,
}; };
static int snd_es1938_new_pcm(struct es1938 *chip, int device) static int snd_es1938_new_pcm(struct es1938 *chip, int device)