redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ALSA: info - Use standard types for info callbacks

Browse source 
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>
This commit is contained in:
Takashi Iwai 2010-04-13 11:22:01 +02:00
parent 067e4a5d23
commit 24e4a1211f
7 changed files with 65 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/sound/info.h
View file

@ -51,15 +51,15 @@ struct snd_info_entry_ops {
unsigned short mode, void **file_private_data); unsigned short mode, void **file_private_data);
int (*release)(struct snd_info_entry *entry, int (*release)(struct snd_info_entry *entry,
unsigned short mode, void *file_private_data); 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, struct file *file, char __user *buf,
unsigned long count, unsigned long pos); size_t count, loff_t pos);
long (*write)(struct snd_info_entry *entry, void *file_private_data, ssize_t (*write)(struct snd_info_entry *entry, void *file_private_data,
struct file *file, const char __user *buf, struct file *file, const char __user *buf,
unsigned long count, unsigned long pos); size_t count, loff_t pos);
long long (*llseek)(struct snd_info_entry *entry, loff_t (*llseek)(struct snd_info_entry *entry,
void *file_private_data, struct file *file, 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, unsigned int (*poll)(struct snd_info_entry *entry,
void *file_private_data, struct file *file, void *file_private_data, struct file *file,
poll_table *wait); poll_table *wait);

19
sound/drivers/opl4/opl4_proc.c
View file

@ -49,9 +49,10 @@ static int snd_opl4_mem_proc_release(struct snd_info_entry *entry,
return 0; 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, 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; struct snd_opl4 *opl4 = entry->private_data;
long size; long size;
@ -75,9 +76,11 @@ static long snd_opl4_mem_proc_read(struct snd_info_entry *entry, void *file_priv
return 0; return 0;
} }
static long snd_opl4_mem_proc_write(struct snd_info_entry *entry, void *file_private_data, static ssize_t snd_opl4_mem_proc_write(struct snd_info_entry *entry,
struct file *file, const char __user *_buf, void *file_private_data,
unsigned long count, unsigned long pos) struct file *file,
const char __user *_buf,
size_t count, size_t pos)
{ {
struct snd_opl4 *opl4 = entry->private_data; struct snd_opl4 *opl4 = entry->private_data;
long size; long size;
@ -101,8 +104,10 @@ static long snd_opl4_mem_proc_write(struct snd_info_entry *entry, void *file_pri
return 0; return 0;
} }
static long long snd_opl4_mem_proc_llseek(struct snd_info_entry *entry, void *file_private_data, static loff_t snd_opl4_mem_proc_llseek(struct snd_info_entry *entry,
struct file *file, long long offset, int orig) void *file_private_data,
struct file *file,
loff_t offset, int orig)
{ {
switch (orig) { switch (orig) {
case SEEK_SET: case SEEK_SET:

10
sound/isa/gus/gus_mem_proc.c
View file

@ -31,9 +31,10 @@ struct gus_proc_private {
struct snd_gus_card * gus; 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, struct file *file, char __user *buf,
unsigned long count, unsigned long pos) size_t count, loff_t pos)
{ {
long size; long size;
struct gus_proc_private *priv = entry->private_data; 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; 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, void *private_file_data,
struct file *file, struct file *file,
long long offset, loff_t offset, int orig)
int orig)
{ {
struct gus_proc_private *priv = entry->private_data; struct gus_proc_private *priv = entry->private_data;

8
sound/pci/cs4281.c
View file

@ -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); 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, void *file_private_data,
struct file *file, char __user *buf, struct file *file, char __user *buf,
unsigned long count, unsigned long pos) size_t count, loff_t pos)
{ {
long size; long size;
struct cs4281 *chip = entry->private_data; struct cs4281 *chip = entry->private_data;
@ -1157,10 +1157,10 @@ static long snd_cs4281_BA0_read(struct snd_info_entry *entry,
return size; 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, void *file_private_data,
struct file *file, char __user *buf, struct file *file, char __user *buf,
unsigned long count, unsigned long pos) size_t count, loff_t pos)
{ {
long size; long size;
struct cs4281 *chip = entry->private_data; struct cs4281 *chip = entry->private_data;

5
sound/pci/cs46xx/cs46xx_lib.c
View file

@ -2657,9 +2657,10 @@ static inline void snd_cs46xx_remove_gameport(struct snd_cs46xx *chip) { }
* proc interface * 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, struct file *file, char __user *buf,
unsigned long count, unsigned long pos) size_t count, loff_t pos)
{ {
long size; long size;
struct snd_cs46xx_region *region = entry->private_data; struct snd_cs46xx_region *region = entry->private_data;

4
sound/pci/emu10k1/emuproc.c
View file

@ -341,10 +341,10 @@ static void snd_emu10k1_proc_acode_read(struct snd_info_entry *entry,
#define TOTAL_SIZE_CODE (0x200*8) #define TOTAL_SIZE_CODE (0x200*8)
#define A_TOTAL_SIZE_CODE (0x400*8) #define A_TOTAL_SIZE_CODE (0x400*8)
static long snd_emu10k1_fx8010_read(struct snd_info_entry *entry, static ssize_t snd_emu10k1_fx8010_read(struct snd_info_entry *entry,
void *file_private_data, void *file_private_data,
struct file *file, char __user *buf, struct file *file, char __user *buf,
unsigned long count, unsigned long pos) size_t count, loff_t pos)
{ {
long size; long size;
struct snd_emu10k1 *emu = entry->private_data; struct snd_emu10k1 *emu = entry->private_data;

20
sound/pci/mixart/mixart.c
View file

@ -1102,11 +1102,10 @@ static int snd_mixart_free(struct mixart_mgr *mgr)
/* /*
* proc interface * proc interface
*/ */
static long long snd_mixart_BA0_llseek(struct snd_info_entry *entry, static loff_t snd_mixart_BA0_llseek(struct snd_info_entry *entry,
void *private_file_data, void *private_file_data,
struct file *file, struct file *file,
long long offset, loff_t offset, int orig)
int orig)
{ {
offset = offset & ~3; /* 4 bytes aligned */ 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; return file->f_pos;
} }
static long long snd_mixart_BA1_llseek(struct snd_info_entry *entry, static loff_t snd_mixart_BA1_llseek(struct snd_info_entry *entry,
void *private_file_data, void *private_file_data,
struct file *file, struct file *file,
long long offset, loff_t offset, int orig)
int orig)
{ {
offset = offset & ~3; /* 4 bytes aligned */ 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 mixart_BA0 proc interface for BAR 0 - read callback
*/ */
static long snd_mixart_BA0_read(struct snd_info_entry *entry, void *file_private_data, static ssize_t snd_mixart_BA0_read(struct snd_info_entry *entry,
void *file_private_data,
struct file *file, char __user *buf, struct file *file, char __user *buf,
unsigned long count, unsigned long pos) size_t count, loff_t pos)
{ {
struct mixart_mgr *mgr = entry->private_data; struct mixart_mgr *mgr = entry->private_data;
unsigned long maxsize; 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 mixart_BA1 proc interface for BAR 1 - read callback
*/ */
static long snd_mixart_BA1_read(struct snd_info_entry *entry, void *file_private_data, static ssize_t snd_mixart_BA1_read(struct snd_info_entry *entry,
void *file_private_data,
struct file *file, char __user *buf, struct file *file, char __user *buf,
unsigned long count, unsigned long pos) size_t count, loff_t pos)
{ {
struct mixart_mgr *mgr = entry->private_data; struct mixart_mgr *mgr = entry->private_data;
unsigned long maxsize; unsigned long maxsize;