aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--include/sound/info.h24
-rw-r--r--sound/drivers/opl4/opl4_proc.c21
-rw-r--r--sound/isa/gus/gus_mem_proc.c16
-rw-r--r--sound/pci/cs4281.c16
-rw-r--r--sound/pci/cs46xx/cs46xx_lib.c7
-rw-r--r--sound/pci/emu10k1/emuproc.c8
-rw-r--r--sound/pci/mixart/mixart.c32
7 files changed, 65 insertions, 59 deletions
diff --git a/include/sound/info.h b/include/sound/info.h
index 112e8949e1a7..4e94cf1ff762 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -51,18 +51,18 @@ struct snd_info_entry_ops {
51 unsigned short mode, void **file_private_data); 51 unsigned short mode, void **file_private_data);
52 int (*release)(struct snd_info_entry *entry, 52 int (*release)(struct snd_info_entry *entry,
53 unsigned short mode, void *file_private_data); 53 unsigned short mode, void *file_private_data);
54 long (*read)(struct snd_info_entry *entry, void *file_private_data, 54 ssize_t (*read)(struct snd_info_entry *entry, void *file_private_data,
55 struct file *file, char __user *buf, 55 struct file *file, char __user *buf,
56 unsigned long count, unsigned long pos); 56 size_t count, loff_t pos);
57 long (*write)(struct snd_info_entry *entry, void *file_private_data, 57 ssize_t (*write)(struct snd_info_entry *entry, void *file_private_data,
58 struct file *file, const char __user *buf, 58 struct file *file, const char __user *buf,
59 unsigned long count, unsigned long pos); 59 size_t count, loff_t pos);
60 long long (*llseek)(struct snd_info_entry *entry, 60 loff_t (*llseek)(struct snd_info_entry *entry,
61 void *file_private_data, struct file *file, 61 void *file_private_data, struct file *file,
62 long long offset, int orig); 62 loff_t offset, int orig);
63 unsigned int(*poll)(struct snd_info_entry *entry, 63 unsigned int (*poll)(struct snd_info_entry *entry,
64 void *file_private_data, struct file *file, 64 void *file_private_data, struct file *file,
65 poll_table *wait); 65 poll_table *wait);
66 int (*ioctl)(struct snd_info_entry *entry, void *file_private_data, 66 int (*ioctl)(struct snd_info_entry *entry, void *file_private_data,
67 struct file *file, unsigned int cmd, unsigned long arg); 67 struct file *file, unsigned int cmd, unsigned long arg);
68 int (*mmap)(struct snd_info_entry *entry, void *file_private_data, 68 int (*mmap)(struct snd_info_entry *entry, void *file_private_data,
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:
diff --git a/sound/isa/gus/gus_mem_proc.c b/sound/isa/gus/gus_mem_proc.c
index 2803e227aec9..b2d2dba6c860 100644
--- a/sound/isa/gus/gus_mem_proc.c
+++ b/sound/isa/gus/gus_mem_proc.c
@@ -31,9 +31,10 @@ struct gus_proc_private {
31 struct snd_gus_card * gus; 31 struct snd_gus_card * gus;
32}; 32};
33 33
34static long snd_gf1_mem_proc_dump(struct snd_info_entry *entry, void *file_private_data, 34static ssize_t snd_gf1_mem_proc_dump(struct snd_info_entry *entry,
35 struct file *file, char __user *buf, 35 void *file_private_data,
36 unsigned long count, unsigned long pos) 36 struct file *file, char __user *buf,
37 size_t count, loff_t pos)
37{ 38{
38 long size; 39 long size;
39 struct gus_proc_private *priv = entry->private_data; 40 struct gus_proc_private *priv = entry->private_data;
@@ -51,11 +52,10 @@ static long snd_gf1_mem_proc_dump(struct snd_info_entry *entry, void *file_priva
51 return 0; 52 return 0;
52} 53}
53 54
54static long long snd_gf1_mem_proc_llseek(struct snd_info_entry *entry, 55static loff_t snd_gf1_mem_proc_llseek(struct snd_info_entry *entry,
55 void *private_file_data, 56 void *private_file_data,
56 struct file *file, 57 struct file *file,
57 long long offset, 58 loff_t offset, int orig)
58 int orig)
59{ 59{
60 struct gus_proc_private *priv = entry->private_data; 60 struct gus_proc_private *priv = entry->private_data;
61 61
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index 9edc65059e3e..b0bba2e86b12 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1139,10 +1139,10 @@ static void snd_cs4281_proc_read(struct snd_info_entry *entry,
1139 snd_iprintf(buffer, "Spurious end IRQs : %u\n", chip->spurious_dtc_irq); 1139 snd_iprintf(buffer, "Spurious end IRQs : %u\n", chip->spurious_dtc_irq);
1140} 1140}
1141 1141
1142static long snd_cs4281_BA0_read(struct snd_info_entry *entry, 1142static ssize_t snd_cs4281_BA0_read(struct snd_info_entry *entry,
1143 void *file_private_data, 1143 void *file_private_data,
1144 struct file *file, char __user *buf, 1144 struct file *file, char __user *buf,
1145 unsigned long count, unsigned long pos) 1145 size_t count, loff_t pos)
1146{ 1146{
1147 long size; 1147 long size;
1148 struct cs4281 *chip = entry->private_data; 1148 struct cs4281 *chip = entry->private_data;
@@ -1157,10 +1157,10 @@ static long snd_cs4281_BA0_read(struct snd_info_entry *entry,
1157 return size; 1157 return size;
1158} 1158}
1159 1159
1160static long snd_cs4281_BA1_read(struct snd_info_entry *entry, 1160static ssize_t snd_cs4281_BA1_read(struct snd_info_entry *entry,
1161 void *file_private_data, 1161 void *file_private_data,
1162 struct file *file, char __user *buf, 1162 struct file *file, char __user *buf,
1163 unsigned long count, unsigned long pos) 1163 size_t count, loff_t pos)
1164{ 1164{
1165 long size; 1165 long size;
1166 struct cs4281 *chip = entry->private_data; 1166 struct cs4281 *chip = entry->private_data;
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 3f99a5e8528c..08117b142381 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -2657,9 +2657,10 @@ static inline void snd_cs46xx_remove_gameport(struct snd_cs46xx *chip) { }
2657 * proc interface 2657 * proc interface
2658 */ 2658 */
2659 2659
2660static long snd_cs46xx_io_read(struct snd_info_entry *entry, void *file_private_data, 2660static ssize_t snd_cs46xx_io_read(struct snd_info_entry *entry,
2661 struct file *file, char __user *buf, 2661 void *file_private_data,
2662 unsigned long count, unsigned long pos) 2662 struct file *file, char __user *buf,
2663 size_t count, loff_t pos)
2663{ 2664{
2664 long size; 2665 long size;
2665 struct snd_cs46xx_region *region = entry->private_data; 2666 struct snd_cs46xx_region *region = entry->private_data;
diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
index baa7cd508cd8..347b2415db59 100644
--- a/sound/pci/emu10k1/emuproc.c
+++ b/sound/pci/emu10k1/emuproc.c
@@ -341,10 +341,10 @@ static void snd_emu10k1_proc_acode_read(struct snd_info_entry *entry,
341#define TOTAL_SIZE_CODE (0x200*8) 341#define TOTAL_SIZE_CODE (0x200*8)
342#define A_TOTAL_SIZE_CODE (0x400*8) 342#define A_TOTAL_SIZE_CODE (0x400*8)
343 343
344static long snd_emu10k1_fx8010_read(struct snd_info_entry *entry, 344static ssize_t snd_emu10k1_fx8010_read(struct snd_info_entry *entry,
345 void *file_private_data, 345 void *file_private_data,
346 struct file *file, char __user *buf, 346 struct file *file, char __user *buf,
347 unsigned long count, unsigned long pos) 347 size_t count, loff_t pos)
348{ 348{
349 long size; 349 long size;
350 struct snd_emu10k1 *emu = entry->private_data; 350 struct snd_emu10k1 *emu = entry->private_data;
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 3be8f97c8bc0..b5df78bcc25b 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1102,11 +1102,10 @@ static int snd_mixart_free(struct mixart_mgr *mgr)
1102/* 1102/*
1103 * proc interface 1103 * proc interface
1104 */ 1104 */
1105static long long snd_mixart_BA0_llseek(struct snd_info_entry *entry, 1105static loff_t snd_mixart_BA0_llseek(struct snd_info_entry *entry,
1106 void *private_file_data, 1106 void *private_file_data,
1107 struct file *file, 1107 struct file *file,
1108 long long offset, 1108 loff_t offset, int orig)
1109 int orig)
1110{ 1109{
1111 offset = offset & ~3; /* 4 bytes aligned */ 1110 offset = offset & ~3; /* 4 bytes aligned */
1112 1111
@@ -1128,11 +1127,10 @@ static long long snd_mixart_BA0_llseek(struct snd_info_entry *entry,
1128 return file->f_pos; 1127 return file->f_pos;
1129} 1128}
1130 1129
1131static long long snd_mixart_BA1_llseek(struct snd_info_entry *entry, 1130static loff_t snd_mixart_BA1_llseek(struct snd_info_entry *entry,
1132 void *private_file_data, 1131 void *private_file_data,
1133 struct file *file, 1132 struct file *file,
1134 long long offset, 1133 loff_t offset, int orig)
1135 int orig)
1136{ 1134{
1137 offset = offset & ~3; /* 4 bytes aligned */ 1135 offset = offset & ~3; /* 4 bytes aligned */
1138 1136
@@ -1157,9 +1155,10 @@ static long long snd_mixart_BA1_llseek(struct snd_info_entry *entry,
1157/* 1155/*
1158 mixart_BA0 proc interface for BAR 0 - read callback 1156 mixart_BA0 proc interface for BAR 0 - read callback
1159 */ 1157 */
1160static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_private_data, 1158static ssize_t snd_mixart_BA0_read(struct snd_info_entry *entry,
1161 struct file *file, char __user *buf, 1159 void *file_private_data,
1162 unsigned long count, unsigned long pos) 1160 struct file *file, char __user *buf,
1161 size_t count, loff_t pos)
1163{ 1162{
1164 struct mixart_mgr *mgr = entry->private_data; 1163 struct mixart_mgr *mgr = entry->private_data;
1165 unsigned long maxsize; 1164 unsigned long maxsize;
@@ -1178,9 +1177,10 @@ static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_private
1178/* 1177/*
1179 mixart_BA1 proc interface for BAR 1 - read callback 1178 mixart_BA1 proc interface for BAR 1 - read callback
1180 */ 1179 */
1181static long snd_mixart_BA1_read(struct snd_info_entry *entry, void *file_private_data, 1180static ssize_t snd_mixart_BA1_read(struct snd_info_entry *entry,
1182 struct file *file, char __user *buf, 1181 void *file_private_data,
1183 unsigned long count, unsigned long pos) 1182 struct file *file, char __user *buf,
1183 size_t count, loff_t pos)
1184{ 1184{
1185 struct mixart_mgr *mgr = entry->private_data; 1185 struct mixart_mgr *mgr = entry->private_data;
1186 unsigned long maxsize; 1186 unsigned long maxsize;
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-21 08:49:57 -0500