aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSouptick Joarder <jrdr.linux@gmail.com>2018-04-25 00:14:45 -0400
committerTakashi Iwai <tiwai@suse.de>2018-04-25 02:15:20 -0400
commit295810516e302be90fe469b17b8ac0ac486da3bf (patch)
treeb2e7097d9402ec65ca6c93cd53fee42c5a66563e
parent8e0428a7e7a8e521540f7f87ce1c55ae04acd708 (diff)
ALSA: usx2y: Change return type to vm_fault_t
Use new return type vm_fault_t for fault handler. For now, this is just documenting that the function returns a VM_FAULT value rather than an errno. Once all instances are converted, vm_fault_t will become a distinct type. Commit 1c8f422059ae ("mm: change return type to vm_fault_t") Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/usx2y/us122l.c2
-rw-r--r--sound/usb/usx2y/usX2Yhwdep.c2
-rw-r--r--sound/usb/usx2y/usx2yhwdeppcm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index ebcab5c5465d..8082f7b077f1 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -139,7 +139,7 @@ static void usb_stream_hwdep_vm_open(struct vm_area_struct *area)
139 snd_printdd(KERN_DEBUG "%i\n", atomic_read(&us122l->mmap_count)); 139 snd_printdd(KERN_DEBUG "%i\n", atomic_read(&us122l->mmap_count));
140} 140}
141 141
142static int usb_stream_hwdep_vm_fault(struct vm_fault *vmf) 142static vm_fault_t usb_stream_hwdep_vm_fault(struct vm_fault *vmf)
143{ 143{
144 unsigned long offset; 144 unsigned long offset;
145 struct page *page; 145 struct page *page;
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index d8bd7c99b48c..c1dd9a7b48df 100644
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -31,7 +31,7 @@
31#include "usbusx2y.h" 31#include "usbusx2y.h"
32#include "usX2Yhwdep.h" 32#include "usX2Yhwdep.h"
33 33
34static int snd_us428ctls_vm_fault(struct vm_fault *vmf) 34static vm_fault_t snd_us428ctls_vm_fault(struct vm_fault *vmf)
35{ 35{
36 unsigned long offset; 36 unsigned long offset;
37 struct page * page; 37 struct page * page;
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index 0d050528a4e1..4fd9276b8e50 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -652,7 +652,7 @@ static void snd_usX2Y_hwdep_pcm_vm_close(struct vm_area_struct *area)
652} 652}
653 653
654 654
655static int snd_usX2Y_hwdep_pcm_vm_fault(struct vm_fault *vmf) 655static vm_fault_t snd_usX2Y_hwdep_pcm_vm_fault(struct vm_fault *vmf)
656{ 656{
657 unsigned long offset; 657 unsigned long offset;
658 void *vaddr; 658 void *vaddr;