sound: Remove unnecessary casts of private_data

[net-next-2.6.git] / sound / oss / au1550_ac97.c

diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index c4a4cdc07ab9de2a1c33384d18f4f55e8b8f28a6..8a12621d8b3ae8e0aaffc782ce944294239a92e3 100644 (file)
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -50,7 +50,6 @@
 #include <linux/poll.h>
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 #include <linux/ac97_codec.h>
 #include <linux/mutex.h>
 
@@ -172,7 +171,7 @@ au1550_delay(int msec)
 static u16
 rdcodec(struct ac97_codec *codec, u8 addr)
 {
-       struct au1550_state *s = (struct au1550_state *)codec->private_data;
+       struct au1550_state *s = codec->private_data;
        unsigned long   flags;
        u32             cmd, val;
        u16             data;
@@ -240,7 +239,7 @@ rdcodec(struct ac97_codec *codec, u8 addr)
 static void
 wrcodec(struct ac97_codec *codec, u8 addr, u16 data)
 {
-       struct au1550_state *s = (struct au1550_state *)codec->private_data;
+       struct au1550_state *s = codec->private_data;
        unsigned long   flags;
        u32             cmd, val;
        int             i;
@@ -821,7 +820,7 @@ mixdev_ioctl(struct ac97_codec *codec, unsigned int cmd,
 static long
 au1550_ioctl_mixdev(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       struct au1550_state *s = (struct au1550_state *)file->private_data;
+       struct au1550_state *s = file->private_data;
        struct ac97_codec *codec = s->codec;
        int ret;
 
@@ -1032,7 +1031,7 @@ copy_dmabuf_user(struct dmabuf *db, char* userbuf, int count, int to_user)
 static ssize_t
 au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
 {
-       struct au1550_state *s = (struct au1550_state *)file->private_data;
+       struct au1550_state *s = file->private_data;
        struct dmabuf  *db = &s->dma_adc;
        DECLARE_WAITQUEUE(wait, current);
        ssize_t         ret;
@@ -1112,7 +1111,7 @@ out2:
 static ssize_t
 au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
 {
-       struct au1550_state *s = (struct au1550_state *)file->private_data;
+       struct au1550_state *s = file->private_data;
        struct dmabuf  *db = &s->dma_dac;
        DECLARE_WAITQUEUE(wait, current);
        ssize_t         ret = 0;
@@ -1212,7 +1211,7 @@ out2:
 static unsigned int
 au1550_poll(struct file *file, struct poll_table_struct *wait)
 {
-       struct au1550_state *s = (struct au1550_state *)file->private_data;
+       struct au1550_state *s = file->private_data;
        unsigned long   flags;
        unsigned int    mask = 0;
 
@@ -1251,7 +1250,7 @@ au1550_poll(struct file *file, struct poll_table_struct *wait)
 static int
 au1550_mmap(struct file *file, struct vm_area_struct *vma)
 {
-       struct au1550_state *s = (struct au1550_state *)file->private_data;
+       struct au1550_state *s = file->private_data;
        struct dmabuf  *db;
        unsigned long   size;
        int ret = 0;
@@ -1343,7 +1342,7 @@ dma_count_done(struct dmabuf *db)
 static int
 au1550_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-       struct au1550_state *s = (struct au1550_state *)file->private_data;
+       struct au1550_state *s = file->private_data;
        unsigned long   flags;
        audio_buf_info  abinfo;
        count_info      cinfo;
@@ -1869,7 +1868,7 @@ out2:
 static int
 au1550_release(struct inode *inode, struct file *file)
 {
-       struct au1550_state *s = (struct au1550_state *)file->private_data;
+       struct au1550_state *s = file->private_data;
 
        lock_kernel();