ALSA: nm256: Convert to new PCM copy ops

[karo-tx-linux.git] / sound / pci / nm256 / nm256.c

diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 103fe311e5a9827a6fba13e54d035f736b69370d..63f0985dae27dc799951ee625a7dc1d711bfc5a8 100644 (file)
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -695,53 +695,68 @@ snd_nm256_capture_pointer(struct snd_pcm_substream *substream)
  */
 static int
 snd_nm256_playback_silence(struct snd_pcm_substream *substream,
-                          int channel, /* not used (interleaved data) */
-                          snd_pcm_uframes_t pos,
-                          snd_pcm_uframes_t count)
+                          int channel, unsigned long pos, unsigned long count)
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct nm256_stream *s = runtime->private_data;
-       count = frames_to_bytes(runtime, count);
-       pos = frames_to_bytes(runtime, pos);
+
        memset_io(s->bufptr + pos, 0, count);
        return 0;
 }
 
 static int
 snd_nm256_playback_copy(struct snd_pcm_substream *substream,
-                       int channel, /* not used (interleaved data) */
-                       snd_pcm_uframes_t pos,
-                       void __user *src,
-                       snd_pcm_uframes_t count)
+                       int channel, unsigned long pos,
+                       void __user *src, unsigned long count)
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct nm256_stream *s = runtime->private_data;
-       count = frames_to_bytes(runtime, count);
-       pos = frames_to_bytes(runtime, pos);
+
        if (copy_from_user_toio(s->bufptr + pos, src, count))
                return -EFAULT;
        return 0;
 }
 
+static int
+snd_nm256_playback_copy_kernel(struct snd_pcm_substream *substream,
+                              int channel, unsigned long pos,
+                              void *src, unsigned long count)
+{
+       struct snd_pcm_runtime *runtime = substream->runtime;
+       struct nm256_stream *s = runtime->private_data;
+
+       memcpy_toio(s->bufptr + pos, src, count);
+       return 0;
+}
+
 /*
  * copy to user
  */
 static int
 snd_nm256_capture_copy(struct snd_pcm_substream *substream,
-                      int channel, /* not used (interleaved data) */
-                      snd_pcm_uframes_t pos,
-                      void __user *dst,
-                      snd_pcm_uframes_t count)
+                      int channel, unsigned long pos,
+                      void __user *dst, unsigned long count)
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct nm256_stream *s = runtime->private_data;
-       count = frames_to_bytes(runtime, count);
-       pos = frames_to_bytes(runtime, pos);
+
        if (copy_to_user_fromio(dst, s->bufptr + pos, count))
                return -EFAULT;
        return 0;
 }
 
+static int
+snd_nm256_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 nm256_stream *s = runtime->private_data;
+
+       memcpy_fromio(dst, s->bufptr + pos, count);
+       return 0;
+}
+
 #endif /* !__i386__ */
 
 
@@ -911,8 +926,9 @@ static const struct snd_pcm_ops snd_nm256_playback_ops = {
        .trigger =      snd_nm256_playback_trigger,
        .pointer =      snd_nm256_playback_pointer,
 #ifndef __i386__
-       .copy =         snd_nm256_playback_copy,
-       .silence =      snd_nm256_playback_silence,
+       .copy_user =    snd_nm256_playback_copy,
+       .copy_kernel =  snd_nm256_playback_copy_kernel,
+       .fill_silence = snd_nm256_playback_silence,
 #endif
        .mmap =         snd_pcm_lib_mmap_iomem,
 };
@@ -926,7 +942,8 @@ static const struct snd_pcm_ops snd_nm256_capture_ops = {
        .trigger =      snd_nm256_capture_trigger,
        .pointer =      snd_nm256_capture_pointer,
 #ifndef __i386__
-       .copy =         snd_nm256_capture_copy,
+       .copy_user =    snd_nm256_capture_copy,
+       .copy_kernel =  snd_nm256_capture_copy_kernel,
 #endif
        .mmap =         snd_pcm_lib_mmap_iomem,
 };