aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-13 05:22:01 -0400
committerTakashi Iwai <tiwai@suse.de>2010-04-13 05:57:14 -0400
commit24e4a1211f691fc671de44685430dbad757d8487 (patch)
tree904e30d3a24f9b0f28378c72f0924fc1e429f5f2 /sound/drivers
parent067e4a5d23422c9e9a0787b7e18fa2457226d999 (diff)
ALSA: info - Use standard types for info callbacks
Use loff_t, size_t and ssize_t for arguments of info callbacks to follow the standard procfs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers')
-rw-r--r--sound/drivers/opl4/opl4_proc.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/sound/drivers/opl4/opl4_proc.c b/sound/drivers/opl4/opl4_proc.c
index 1679300b7583..eb72814dfd5f 100644
--- a/sound/drivers/opl4/opl4_proc.c
+++ b/sound/drivers/opl4/opl4_proc.c
@@ -49,9 +49,10 @@ static int snd_opl4_mem_proc_release(struct snd_info_entry *entry,
49 return 0; 49 return 0;
50} 50}
51 51
52static long snd_opl4_mem_proc_read(struct snd_info_entry *entry, void *file_private_data, 52static ssize_t snd_opl4_mem_proc_read(struct snd_info_entry *entry,
53 struct file *file, char __user *_buf, 53 void *file_private_data,
54 unsigned long count, unsigned long pos) 54 struct file *file, char __user *_buf,
55 size_t count, loff_t pos)
55{ 56{
56 struct snd_opl4 *opl4 = entry->private_data; 57 struct snd_opl4 *opl4 = entry->private_data;
57 long size; 58 long size;
@@ -75,9 +76,11 @@ static long snd_opl4_mem_proc_read(struct snd_info_entry *entry, void *file_priv
75 return 0; 76 return 0;
76} 77}
77 78
78static long snd_opl4_mem_proc_write(struct snd_info_entry *entry, void *file_private_data, 79static ssize_t snd_opl4_mem_proc_write(struct snd_info_entry *entry,
79 struct file *file, const char __user *_buf, 80 void *file_private_data,
80 unsigned long count, unsigned long pos) 81 struct file *file,
82 const char __user *_buf,
83 size_t count, size_t pos)
81{ 84{
82 struct snd_opl4 *opl4 = entry->private_data; 85 struct snd_opl4 *opl4 = entry->private_data;
83 long size; 86 long size;
@@ -101,8 +104,10 @@ static long snd_opl4_mem_proc_write(struct snd_info_entry *entry, void *file_pri
101 return 0; 104 return 0;
102} 105}
103 106
104static long long snd_opl4_mem_proc_llseek(struct snd_info_entry *entry, void *file_private_data, 107static loff_t snd_opl4_mem_proc_llseek(struct snd_info_entry *entry,
105 struct file *file, long long offset, int orig) 108 void *file_private_data,
109 struct file *file,
110 loff_t offset, int orig)
106{ 111{
107 switch (orig) { 112 switch (orig) {
108 case SEEK_SET: 113 case SEEK_SET: