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>

4 files changed, 32 insertions, 31 deletions

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,
         snd_iprintf(buffer, "Spurious end IRQs    : %u\n", chip->spurious_dtc_irq);
 }
 
-static long snd_cs4281_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_cs4281_BA0_read(struct snd_info_entry *entry,
+                                   void *file_private_data,
+                                   struct file *file, char __user *buf,
+                                   size_t count, loff_t pos)
 {
         long size;
         struct cs4281 *chip = entry->private_data;
@@ -1157,10 +1157,10 @@ static long snd_cs4281_BA0_read(struct snd_info_entry *entry,
         return size;
 }
 
-static long snd_cs4281_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_cs4281_BA1_read(struct snd_info_entry *entry,
+                                   void *file_private_data,
+                                   struct file *file, char __user *buf,
+                                   size_t count, loff_t pos)
 {
         long size;
         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) { }
  *  proc interface
  */
 
-static long snd_cs46xx_io_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_cs46xx_io_read(struct snd_info_entry *entry,
+                                  void *file_private_data,
+                                  struct file *file, char __user *buf,
+                                  size_t count, loff_t pos)
 {
         long size;
         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,
 #define TOTAL_SIZE_CODE         (0x200*8)
 #define A_TOTAL_SIZE_CODE       (0x400*8)
 
-static long snd_emu10k1_fx8010_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_emu10k1_fx8010_read(struct snd_info_entry *entry,
+                                       void *file_private_data,
+                                       struct file *file, char __user *buf,
+                                       size_t count, loff_t pos)
 {
         long size;
         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)
 /*
  * 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;