ALSA: rme96: Convert to generic PCM copy ops

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

Link: https://lore.kernel.org/r/20230815190136.8987-12-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index bccb7e0..6b5ffb1 100644 (file)
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -320,48 +320,26 @@ snd_rme96_playback_silence(struct snd_pcm_substream *substream,
 static int
 snd_rme96_playback_copy(struct snd_pcm_substream *substream,
                        int channel, unsigned long pos,
-                       void __user *src, unsigned long count)
+                       struct iov_iter *src, unsigned long count)
 {
        struct rme96 *rme96 = snd_pcm_substream_chip(substream);
 
-       return copy_from_user_toio(rme96->iobase + RME96_IO_PLAY_BUFFER + pos,
+       return copy_from_iter_toio(rme96->iobase + RME96_IO_PLAY_BUFFER + pos,
                                   src, count);
 }
 
 static int
-snd_rme96_playback_copy_kernel(struct snd_pcm_substream *substream,
-                              int channel, unsigned long pos,
-                              void *src, unsigned long count)
-{
-       struct rme96 *rme96 = snd_pcm_substream_chip(substream);
-
-       memcpy_toio(rme96->iobase + RME96_IO_PLAY_BUFFER + pos, src, count);
-       return 0;
-}
-
-static int
 snd_rme96_capture_copy(struct snd_pcm_substream *substream,
                       int channel, unsigned long pos,
-                      void __user *dst, unsigned long count)
+                      struct iov_iter *dst, unsigned long count)
 {
        struct rme96 *rme96 = snd_pcm_substream_chip(substream);
 
-       return copy_to_user_fromio(dst,
+       return copy_to_iter_fromio(dst,
                                   rme96->iobase + RME96_IO_REC_BUFFER + pos,
                                   count);
 }
 
-static int
-snd_rme96_capture_copy_kernel(struct snd_pcm_substream *substream,
-                             int channel, unsigned long pos,
-                             void *dst, unsigned long count)
-{
-       struct rme96 *rme96 = snd_pcm_substream_chip(substream);
-
-       memcpy_fromio(dst, rme96->iobase + RME96_IO_REC_BUFFER + pos, count);
-       return 0;
-}
-
 /*
  * Digital output capabilities (S/PDIF)
  */
@@ -1518,8 +1496,7 @@ static const struct snd_pcm_ops snd_rme96_playback_spdif_ops = {
        .prepare =      snd_rme96_playback_prepare,
        .trigger =      snd_rme96_playback_trigger,
        .pointer =      snd_rme96_playback_pointer,
-       .copy_user =    snd_rme96_playback_copy,
-       .copy_kernel =  snd_rme96_playback_copy_kernel,
+       .copy =         snd_rme96_playback_copy,
        .fill_silence = snd_rme96_playback_silence,
        .mmap =         snd_pcm_lib_mmap_iomem,
 };
@@ -1531,8 +1508,7 @@ static const struct snd_pcm_ops snd_rme96_capture_spdif_ops = {
        .prepare =      snd_rme96_capture_prepare,
        .trigger =      snd_rme96_capture_trigger,
        .pointer =      snd_rme96_capture_pointer,
-       .copy_user =    snd_rme96_capture_copy,
-       .copy_kernel =  snd_rme96_capture_copy_kernel,
+       .copy =         snd_rme96_capture_copy,
        .mmap =         snd_pcm_lib_mmap_iomem,
 };
 
@@ -1543,8 +1519,7 @@ static const struct snd_pcm_ops snd_rme96_playback_adat_ops = {
        .prepare =      snd_rme96_playback_prepare,
        .trigger =      snd_rme96_playback_trigger,
        .pointer =      snd_rme96_playback_pointer,
-       .copy_user =    snd_rme96_playback_copy,
-       .copy_kernel =  snd_rme96_playback_copy_kernel,
+       .copy =         snd_rme96_playback_copy,
        .fill_silence = snd_rme96_playback_silence,
        .mmap =         snd_pcm_lib_mmap_iomem,
 };
@@ -1556,8 +1531,7 @@ static const struct snd_pcm_ops snd_rme96_capture_adat_ops = {
        .prepare =      snd_rme96_capture_prepare,
        .trigger =      snd_rme96_capture_trigger,
        .pointer =      snd_rme96_capture_pointer,
-       .copy_user =    snd_rme96_capture_copy,
-       .copy_kernel =  snd_rme96_capture_copy_kernel,
+       .copy =         snd_rme96_capture_copy,
        .mmap =         snd_pcm_lib_mmap_iomem,
 };