Commit 24e4a121 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 067e4a5d

include/sound/info.h

+12 −12
Original line number Diff line number Diff line
@@ -51,15 +51,15 @@ struct snd_info_entry_ops { 
		    unsigned short mode, void **file_private_data);

	int (*release)(struct snd_info_entry *entry,

		       unsigned short mode, void *file_private_data);

	long (*read)(struct snd_info_entry *entry, void *file_private_data,

	ssize_t (*read)(struct snd_info_entry *entry, void *file_private_data,

			struct file *file, char __user *buf,

		     unsigned long count, unsigned long pos);

	long (*write)(struct snd_info_entry *entry, void *file_private_data,

			size_t count, loff_t pos);

	ssize_t (*write)(struct snd_info_entry *entry, void *file_private_data,

			 struct file *file, const char __user *buf,

		      unsigned long count, unsigned long pos);

	long long (*llseek)(struct snd_info_entry *entry,

			 size_t count, loff_t pos);

	loff_t (*llseek)(struct snd_info_entry *entry,

			 void *file_private_data, struct file *file,

			    long long offset, int orig);

			 loff_t offset, int orig);

	unsigned int (*poll)(struct snd_info_entry *entry,

			     void *file_private_data, struct file *file,

			     poll_table *wait);

sound/drivers/opl4/opl4_proc.c

+13 −8
Original line number Diff line number Diff line
@@ -49,9 +49,10 @@ static int snd_opl4_mem_proc_release(struct snd_info_entry *entry, 
	return 0;

}



static long snd_opl4_mem_proc_read(struct snd_info_entry *entry, void *file_private_data,

static ssize_t snd_opl4_mem_proc_read(struct snd_info_entry *entry,

				      void *file_private_data,

				      struct file *file, char __user *_buf,

				   unsigned long count, unsigned long pos)

				      size_t count, loff_t pos)

{

	struct snd_opl4 *opl4 = entry->private_data;

	long size;
@@ -75,9 +76,11 @@ static long snd_opl4_mem_proc_read(struct snd_info_entry *entry, void *file_priv 
	return 0;

}



static long snd_opl4_mem_proc_write(struct snd_info_entry *entry, void *file_private_data,

				    struct file *file, const char __user *_buf,

				    unsigned long count, unsigned long pos)

static ssize_t snd_opl4_mem_proc_write(struct snd_info_entry *entry,

				       void *file_private_data,

				       struct file *file,

				       const char __user *_buf,

				       size_t count, size_t pos)

{

	struct snd_opl4 *opl4 = entry->private_data;

	long size;
@@ -101,8 +104,10 @@ static long snd_opl4_mem_proc_write(struct snd_info_entry *entry, void *file_pri 
	return 0;

}



static long long snd_opl4_mem_proc_llseek(struct snd_info_entry *entry, void *file_private_data,

					  struct file *file, long long offset, int orig)

static loff_t snd_opl4_mem_proc_llseek(struct snd_info_entry *entry,

				       void *file_private_data,

				       struct file *file,

				       loff_t offset, int orig)

{

	switch (orig) {

	case SEEK_SET:

sound/isa/gus/gus_mem_proc.c

+8 −8
Original line number Diff line number Diff line
@@ -31,9 +31,10 @@ struct gus_proc_private { 
	struct snd_gus_card * gus;

};



static long snd_gf1_mem_proc_dump(struct snd_info_entry *entry, void *file_private_data,

static ssize_t snd_gf1_mem_proc_dump(struct snd_info_entry *entry,

				     void *file_private_data,

				     struct file *file, char __user *buf,

			          unsigned long count, unsigned long pos)

				     size_t count, loff_t pos)

{

	long size;

	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 
	return 0;

}			



static long long snd_gf1_mem_proc_llseek(struct snd_info_entry *entry,

static loff_t snd_gf1_mem_proc_llseek(struct snd_info_entry *entry,

				      void *private_file_data,

				      struct file *file,

					long long offset,

					int orig)

				      loff_t offset, int orig)

{

	struct gus_proc_private *priv = entry->private_data;

sound/pci/cs4281.c

+8 −8
Original line number Diff line number Diff line
@@ -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,

static ssize_t 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)

				   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,

static ssize_t 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)

				   size_t count, loff_t pos)

{

	long size;

	struct cs4281 *chip = entry->private_data;

sound/pci/cs46xx/cs46xx_lib.c

+4 −3
Original line number Diff line number Diff line
@@ -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,

static ssize_t 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)

				  size_t count, loff_t pos)

{

	long size;

	struct snd_cs46xx_region *region = entry->private_data;