diff options
Diffstat (limited to 'sound/oss/au1550_ac97.c')
-rw-r--r-- | sound/oss/au1550_ac97.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index c6f2621221ba..8a12621d8b3a 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c | |||
@@ -171,7 +171,7 @@ au1550_delay(int msec) | |||
171 | static u16 | 171 | static u16 |
172 | rdcodec(struct ac97_codec *codec, u8 addr) | 172 | rdcodec(struct ac97_codec *codec, u8 addr) |
173 | { | 173 | { |
174 | struct au1550_state *s = (struct au1550_state *)codec->private_data; | 174 | struct au1550_state *s = codec->private_data; |
175 | unsigned long flags; | 175 | unsigned long flags; |
176 | u32 cmd, val; | 176 | u32 cmd, val; |
177 | u16 data; | 177 | u16 data; |
@@ -239,7 +239,7 @@ rdcodec(struct ac97_codec *codec, u8 addr) | |||
239 | static void | 239 | static void |
240 | wrcodec(struct ac97_codec *codec, u8 addr, u16 data) | 240 | wrcodec(struct ac97_codec *codec, u8 addr, u16 data) |
241 | { | 241 | { |
242 | struct au1550_state *s = (struct au1550_state *)codec->private_data; | 242 | struct au1550_state *s = codec->private_data; |
243 | unsigned long flags; | 243 | unsigned long flags; |
244 | u32 cmd, val; | 244 | u32 cmd, val; |
245 | int i; | 245 | int i; |
@@ -820,7 +820,7 @@ mixdev_ioctl(struct ac97_codec *codec, unsigned int cmd, | |||
820 | static long | 820 | static long |
821 | au1550_ioctl_mixdev(struct file *file, unsigned int cmd, unsigned long arg) | 821 | au1550_ioctl_mixdev(struct file *file, unsigned int cmd, unsigned long arg) |
822 | { | 822 | { |
823 | struct au1550_state *s = (struct au1550_state *)file->private_data; | 823 | struct au1550_state *s = file->private_data; |
824 | struct ac97_codec *codec = s->codec; | 824 | struct ac97_codec *codec = s->codec; |
825 | int ret; | 825 | int ret; |
826 | 826 | ||
@@ -1031,7 +1031,7 @@ copy_dmabuf_user(struct dmabuf *db, char* userbuf, int count, int to_user) | |||
1031 | static ssize_t | 1031 | static ssize_t |
1032 | au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos) | 1032 | au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos) |
1033 | { | 1033 | { |
1034 | struct au1550_state *s = (struct au1550_state *)file->private_data; | 1034 | struct au1550_state *s = file->private_data; |
1035 | struct dmabuf *db = &s->dma_adc; | 1035 | struct dmabuf *db = &s->dma_adc; |
1036 | DECLARE_WAITQUEUE(wait, current); | 1036 | DECLARE_WAITQUEUE(wait, current); |
1037 | ssize_t ret; | 1037 | ssize_t ret; |
@@ -1111,7 +1111,7 @@ out2: | |||
1111 | static ssize_t | 1111 | static ssize_t |
1112 | au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos) | 1112 | au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos) |
1113 | { | 1113 | { |
1114 | struct au1550_state *s = (struct au1550_state *)file->private_data; | 1114 | struct au1550_state *s = file->private_data; |
1115 | struct dmabuf *db = &s->dma_dac; | 1115 | struct dmabuf *db = &s->dma_dac; |
1116 | DECLARE_WAITQUEUE(wait, current); | 1116 | DECLARE_WAITQUEUE(wait, current); |
1117 | ssize_t ret = 0; | 1117 | ssize_t ret = 0; |
@@ -1211,7 +1211,7 @@ out2: | |||
1211 | static unsigned int | 1211 | static unsigned int |
1212 | au1550_poll(struct file *file, struct poll_table_struct *wait) | 1212 | au1550_poll(struct file *file, struct poll_table_struct *wait) |
1213 | { | 1213 | { |
1214 | struct au1550_state *s = (struct au1550_state *)file->private_data; | 1214 | struct au1550_state *s = file->private_data; |
1215 | unsigned long flags; | 1215 | unsigned long flags; |
1216 | unsigned int mask = 0; | 1216 | unsigned int mask = 0; |
1217 | 1217 | ||
@@ -1250,7 +1250,7 @@ au1550_poll(struct file *file, struct poll_table_struct *wait) | |||
1250 | static int | 1250 | static int |
1251 | au1550_mmap(struct file *file, struct vm_area_struct *vma) | 1251 | au1550_mmap(struct file *file, struct vm_area_struct *vma) |
1252 | { | 1252 | { |
1253 | struct au1550_state *s = (struct au1550_state *)file->private_data; | 1253 | struct au1550_state *s = file->private_data; |
1254 | struct dmabuf *db; | 1254 | struct dmabuf *db; |
1255 | unsigned long size; | 1255 | unsigned long size; |
1256 | int ret = 0; | 1256 | int ret = 0; |
@@ -1342,7 +1342,7 @@ dma_count_done(struct dmabuf *db) | |||
1342 | static int | 1342 | static int |
1343 | au1550_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | 1343 | au1550_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |
1344 | { | 1344 | { |
1345 | struct au1550_state *s = (struct au1550_state *)file->private_data; | 1345 | struct au1550_state *s = file->private_data; |
1346 | unsigned long flags; | 1346 | unsigned long flags; |
1347 | audio_buf_info abinfo; | 1347 | audio_buf_info abinfo; |
1348 | count_info cinfo; | 1348 | count_info cinfo; |
@@ -1868,7 +1868,7 @@ out2: | |||
1868 | static int | 1868 | static int |
1869 | au1550_release(struct inode *inode, struct file *file) | 1869 | au1550_release(struct inode *inode, struct file *file) |
1870 | { | 1870 | { |
1871 | struct au1550_state *s = (struct au1550_state *)file->private_data; | 1871 | struct au1550_state *s = file->private_data; |
1872 | 1872 | ||
1873 | lock_kernel(); | 1873 | lock_kernel(); |
1874 | 1874 | ||