diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 05:58:57 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 05:58:57 -0400 |
| 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 112e8949e1a7..4e94cf1ff762 100644 --- a/include/sound/info.h +++ b/include/sound/info.h | |||
| @@ -51,18 +51,18 @@ struct snd_info_entry_ops { | |||
| 51 | unsigned short mode, void **file_private_data); | 51 | unsigned short mode, void **file_private_data); |
| 52 | int (*release)(struct snd_info_entry *entry, | 52 | int (*release)(struct snd_info_entry *entry, |
| 53 | unsigned short mode, void *file_private_data); | 53 | unsigned short mode, void *file_private_data); |
| 54 | long (*read)(struct snd_info_entry *entry, void *file_private_data, | 54 | ssize_t (*read)(struct snd_info_entry *entry, void *file_private_data, |
| 55 | struct file *file, char __user *buf, | 55 | struct file *file, char __user *buf, |
| 56 | unsigned long count, unsigned long pos); | 56 | size_t count, loff_t pos); |
| 57 | long (*write)(struct snd_info_entry *entry, void *file_private_data, | 57 | ssize_t (*write)(struct snd_info_entry *entry, void *file_private_data, |
| 58 | struct file *file, const char __user *buf, | 58 | struct file *file, const char __user *buf, |
| 59 | unsigned long count, unsigned long pos); | 59 | size_t count, loff_t pos); |
| 60 | long long (*llseek)(struct snd_info_entry *entry, | 60 | loff_t (*llseek)(struct snd_info_entry *entry, |
| 61 | void *file_private_data, struct file *file, | 61 | void *file_private_data, struct file *file, |
| 62 | long long offset, int orig); | 62 | loff_t offset, int orig); |
| 63 | unsigned int(*poll)(struct snd_info_entry *entry, | 63 | unsigned int (*poll)(struct snd_info_entry *entry, |
| 64 | void *file_private_data, struct file *file, | 64 | void *file_private_data, struct file *file, |
| 65 | poll_table *wait); | 65 | poll_table *wait); |
| 66 | int (*ioctl)(struct snd_info_entry *entry, void *file_private_data, | 66 | int (*ioctl)(struct snd_info_entry *entry, void *file_private_data, |
| 67 | struct file *file, unsigned int cmd, unsigned long arg); | 67 | struct file *file, unsigned int cmd, unsigned long arg); |
| 68 | int (*mmap)(struct snd_info_entry *entry, void *file_private_data, | 68 | int (*mmap)(struct snd_info_entry *entry, void *file_private_data, |