ALSA: dummy: Convert to new PCM copy ops

It's a dummy ops, so just replacing it.

Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 172dacd925f5721c2726194ddb917aa612f4afc3..dd5ed037adf2bb3a6fbaeacff681aaa77b56c4b2 100644 (file)
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -644,15 +644,22 @@ static int alloc_fake_buffer(void)
 }
 
 static int dummy_pcm_copy(struct snd_pcm_substream *substream,
-                         int channel, snd_pcm_uframes_t pos,
-                         void __user *dst, snd_pcm_uframes_t count)
+                         int channel, unsigned long pos,
+                         void __user *dst, unsigned long bytes)
+{
+       return 0; /* do nothing */
+}
+
+static int dummy_pcm_copy_kernel(struct snd_pcm_substream *substream,
+                                int channel, unsigned long pos,
+                                void *dst, unsigned long bytes)
 {
        return 0; /* do nothing */
 }
 
 static int dummy_pcm_silence(struct snd_pcm_substream *substream,
-                            int channel, snd_pcm_uframes_t pos,
-                            snd_pcm_uframes_t count)
+                            int channel, unsigned long pos,
+                            unsigned long bytes)
 {
        return 0; /* do nothing */
 }
@@ -683,8 +690,9 @@ static struct snd_pcm_ops dummy_pcm_ops_no_buf = {
        .prepare =      dummy_pcm_prepare,
        .trigger =      dummy_pcm_trigger,
        .pointer =      dummy_pcm_pointer,
-       .copy =         dummy_pcm_copy,
-       .silence =      dummy_pcm_silence,
+       .copy_user =    dummy_pcm_copy,
+       .copy_kernel =  dummy_pcm_copy_kernel,
+       .fill_silence = dummy_pcm_silence,
        .page =         dummy_pcm_page,
 };