summaryrefslogtreecommitdiffstats
path: root/sound/pci/mixart/mixart.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-13 11:22:01 +0200
committerTakashi Iwai <tiwai@suse.de>2010-04-13 11:57:14 +0200
commit24e4a1211f691fc671de44685430dbad757d8487 (patch)
tree904e30d3a24f9b0f28378c72f0924fc1e429f5f2 /sound/pci/mixart/mixart.c
parent067e4a5d23422c9e9a0787b7e18fa2457226d999 (diff)
downloadblackbird-op-linux-24e4a1211f691fc671de44685430dbad757d8487.tar.gz
blackbird-op-linux-24e4a1211f691fc671de44685430dbad757d8487.zip
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/pci/mixart/mixart.c')
-rw-r--r--sound/pci/mixart/mixart.c32
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)
/*
* proc interface
*/
-static long long snd_mixart_BA0_llseek(struct snd_info_entry *entry,
- void *private_file_data,
- struct file *file,
- long long offset,
- int orig)
+static loff_t snd_mixart_BA0_llseek(struct snd_info_entry *entry,
+ void *private_file_data,
+ struct file *file,
+ loff_t offset, int orig)
{
offset = offset & ~3; /* 4 bytes aligned */
@@ -1128,11 +1127,10 @@ static long long snd_mixart_BA0_llseek(struct snd_info_entry *entry,
return file->f_pos;
}
-static long long snd_mixart_BA1_llseek(struct snd_info_entry *entry,
- void *private_file_data,
- struct file *file,
- long long offset,
- int orig)
+static loff_t snd_mixart_BA1_llseek(struct snd_info_entry *entry,
+ void *private_file_data,
+ struct file *file,
+ loff_t offset, int orig)
{
offset = offset & ~3; /* 4 bytes aligned */
@@ -1157,9 +1155,10 @@ static long long snd_mixart_BA1_llseek(struct snd_info_entry *entry,
/*
mixart_BA0 proc interface for BAR 0 - read callback
*/
-static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_private_data,
- struct file *file, char __user *buf,
- unsigned long count, unsigned long pos)
+static ssize_t snd_mixart_BA0_read(struct snd_info_entry *entry,
+ void *file_private_data,
+ struct file *file, char __user *buf,
+ size_t count, loff_t pos)
{
struct mixart_mgr *mgr = entry->private_data;
unsigned long maxsize;
@@ -1178,9 +1177,10 @@ static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_private
/*
mixart_BA1 proc interface for BAR 1 - read callback
*/
-static long snd_mixart_BA1_read(struct snd_info_entry *entry, void *file_private_data,
- struct file *file, char __user *buf,
- unsigned long count, unsigned long pos)
+static ssize_t snd_mixart_BA1_read(struct snd_info_entry *entry,
+ void *file_private_data,
+ struct file *file, char __user *buf,
+ size_t count, loff_t pos)
{
struct mixart_mgr *mgr = entry->private_data;
unsigned long maxsize;
OpenPOWER on IntegriCloud