diff options
Diffstat (limited to 'sound/pci/mixart/mixart.c')
| -rw-r--r-- | sound/pci/mixart/mixart.c | 32 |
1 files changed, 16 insertions, 16 deletions
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 | */ |
| 1105 | static long long snd_mixart_BA0_llseek(struct snd_info_entry *entry, | 1105 | static 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 | ||
| 1131 | static long long snd_mixart_BA1_llseek(struct snd_info_entry *entry, | 1130 | static 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 | */ |
| 1160 | static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_private_data, | 1158 | static 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 | */ |
| 1181 | static long snd_mixart_BA1_read(struct snd_info_entry *entry, void *file_private_data, | 1180 | static 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; |