Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[net-next-2.6.git] / drivers / staging / lirc / lirc_zilog.c

diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
index d920644985235e452a51ffbee891a3946171837b..f0076eb025f1a0e9d412080caab87f627dda4970 100644 (file)
--- a/drivers/staging/lirc/lirc_zilog.c
+++ b/drivers/staging/lirc/lirc_zilog.c
@@ -716,7 +716,7 @@ static loff_t lseek(struct file *filep, loff_t offset, int orig)
 /* copied from lirc_dev */
 static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
 {
-       struct IR *ir = (struct IR *)filep->private_data;
+       struct IR *ir = filep->private_data;
        unsigned char buf[ir->buf.chunk_size];
        int ret = 0, written = 0;
        DECLARE_WAITQUEUE(wait, current);
@@ -898,7 +898,7 @@ done:
 static ssize_t write(struct file *filep, const char *buf, size_t n,
                          loff_t *ppos)
 {
-       struct IR *ir = (struct IR *)filep->private_data;
+       struct IR *ir = filep->private_data;
        size_t i;
        int failures = 0;
 
@@ -972,7 +972,7 @@ static ssize_t write(struct file *filep, const char *buf, size_t n,
 /* copied from lirc_dev */
 static unsigned int poll(struct file *filep, poll_table *wait)
 {
-       struct IR *ir = (struct IR *)filep->private_data;
+       struct IR *ir = filep->private_data;
        unsigned int ret;
 
        dprintk("poll called\n");
@@ -994,7 +994,7 @@ static unsigned int poll(struct file *filep, poll_table *wait)
 
 static long ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
 {
-       struct IR *ir = (struct IR *)filep->private_data;
+       struct IR *ir = filep->private_data;
        int result;
        unsigned long mode, features = 0;
 
@@ -1086,7 +1086,7 @@ static int open(struct inode *node, struct file *filep)
 static int close(struct inode *node, struct file *filep)
 {
        /* find our IR struct */
-       struct IR *ir = (struct IR *)filep->private_data;
+       struct IR *ir = filep->private_data;
        if (ir == NULL) {
                zilog_error("close: no private_data attached to the file!\n");
                return -ENODEV;