diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 11:58:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 11:58:57 +0200 |
| commit | 3374cd1abd478f767aaedf2c21d109596ff0fe72 (patch) | |
| tree | 46b00a571ba5d86373bd9054fdccc5dc6e28e42f /include | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
| parent | 670ff6abd6caff406b217f8a828d6c03656535d8 (diff) | |
Merge branch 'topic/core-cleanup' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/info.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/sound/info.h b/include/sound/info.h index 112e8949e1a..4e94cf1ff76 100644 --- a/include/sound/info.h +++ b/include/sound/info.h @@ -51,18 +51,18 @@ 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, - struct file *file, char __user *buf, - unsigned long count, unsigned long pos); - long (*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, - void *file_private_data, struct file *file, - long long offset, int orig); - unsigned int(*poll)(struct snd_info_entry *entry, - void *file_private_data, struct file *file, - poll_table *wait); + ssize_t (*read)(struct snd_info_entry *entry, void *file_private_data, + struct file *file, char __user *buf, + 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, + size_t count, loff_t pos); + loff_t (*llseek)(struct snd_info_entry *entry, + void *file_private_data, struct file *file, + loff_t offset, int orig); + unsigned int (*poll)(struct snd_info_entry *entry, + void *file_private_data, struct file *file, + poll_table *wait); int (*ioctl)(struct snd_info_entry *entry, void *file_private_data, struct file *file, unsigned int cmd, unsigned long arg); int (*mmap)(struct snd_info_entry *entry, void *file_private_data, |