diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/lirc/lirc_zilog.c | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/lirc/lirc_zilog.c')
-rw-r--r-- | drivers/staging/lirc/lirc_zilog.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c index 100caab1..9b77552 100644 --- 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; |