bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ALSA: gus: Convert to generic PCM copy ops

Browse source 
This patch converts the GUS 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.

Link: https://lore.kernel.org/r/20230815190136.8987-6-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2023-08-15 21:01:16 +02:00
parent 526a19b3e3
commit e2964cd7ef
1 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

23
sound/isa/gus/gus_pcm.c
View file

@ -369,7 +369,7 @@ static int playback_copy_ack(struct snd_pcm_substream *substream,
static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream, static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,
int voice, unsigned long pos, int voice, unsigned long pos,
void __user *src, unsigned long count) struct iov_iter *src, unsigned long count)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct gus_pcm_private *pcmp = runtime->private_data; struct gus_pcm_private *pcmp = runtime->private_data;
@ -379,27 +379,11 @@ static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,
bpos = get_bpos(pcmp, voice, pos, len); bpos = get_bpos(pcmp, voice, pos, len);
if (bpos < 0) if (bpos < 0)
return pos; return pos;
if (copy_from_user(runtime->dma_area + bpos, src, len)) if (copy_from_iter(runtime->dma_area + bpos, len, src) != len)
return -EFAULT; return -EFAULT;
return playback_copy_ack(substream, bpos, len); return playback_copy_ack(substream, bpos, len);
} }
static int snd_gf1_pcm_playback_copy_kernel(struct snd_pcm_substream *substream,
int voice, unsigned long pos,
void *src, unsigned long count)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct gus_pcm_private *pcmp = runtime->private_data;
unsigned int len = count;
int bpos;
bpos = get_bpos(pcmp, voice, pos, len);
if (bpos < 0)
return pos;
memcpy(runtime->dma_area + bpos, src, len);
return playback_copy_ack(substream, bpos, len);
}
static int snd_gf1_pcm_playback_silence(struct snd_pcm_substream *substream, static int snd_gf1_pcm_playback_silence(struct snd_pcm_substream *substream,
int voice, unsigned long pos, int voice, unsigned long pos,
unsigned long count) unsigned long count)
@ -830,8 +814,7 @@ static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = {
.prepare = snd_gf1_pcm_playback_prepare, .prepare = snd_gf1_pcm_playback_prepare,
.trigger = snd_gf1_pcm_playback_trigger, .trigger = snd_gf1_pcm_playback_trigger,
.pointer = snd_gf1_pcm_playback_pointer, .pointer = snd_gf1_pcm_playback_pointer,
.copy_user = snd_gf1_pcm_playback_copy, .copy = snd_gf1_pcm_playback_copy,
.copy_kernel = snd_gf1_pcm_playback_copy_kernel,
.fill_silence = snd_gf1_pcm_playback_silence, .fill_silence = snd_gf1_pcm_playback_silence,
}; };