* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (841 commits) Staging: brcm80211: fix usage of roundup in structures Staging: bcm: fix up network device reference counting Staging: keucr: fix up US_ macro change staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames. staging: brcm80211: Remove unnecessary header files. staging: brcm80211: Remove unnecessary includes from bcmutils.c staging: brcm80211: Removed unnecessary pktsetprio() function. Staging: brcm80211: remove typedefs.h Staging: brcm80211: remove uintptr typedef usage Staging: hv: remove struct vmbus_channel_interface Staging: hv: remove Open from struct vmbus_channel_interface Staging: hv: storvsc: call vmbus_open directly Staging: hv: netvsc: call vmbus_open directly Staging: hv: channel: export vmbus_open to modules Staging: hv: remove Close from struct vmbus_channel_interface Staging: hv: netvsc: call vmbus_close directly Staging: hv: storvsc: call vmbus_close directly Staging: hv: channel: export vmbus_close to modules Staging: hv: remove SendPacket from struct vmbus_channel_interface Staging: hv: storvsc: call vmbus_sendpacket directly ... Fix up conflicts in drivers/staging/cx25821/cx25821-audio-upstream.c drivers/staging/cx25821/cx25821-audio.h due to warring whitespace cleanups (neither of which were all that great)
Showing the changes to drivers/staging/lirc/lirc_zilog.c (1 of 1365 files). Show all
Unified · Split
| @@ -716,7 +716,7 @@ static loff_t lseek(struct file *filep, loff_t offset, int orig) · 715 unmodified lines | ||
| 716 | 716 | /* copied from lirc_dev */ |
| 717 | 717 | static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos) |
| 718 | 718 | { |
| 719 | − struct IR *ir = (struct IR *)filep->private_data; | |
| 719 | + struct IR *ir = filep->private_data; | |
| 720 | 720 | unsigned char buf[ir->buf.chunk_size]; |
| 721 | 721 | int ret = 0, written = 0; |
| 722 | 722 | DECLARE_WAITQUEUE(wait, current); |
| @@ -898,7 +898,7 @@ done: · 175 unmodified lines | ||
| 898 | 898 | static ssize_t write(struct file *filep, const char *buf, size_t n, |
| 899 | 899 | loff_t *ppos) |
| 900 | 900 | { |
| 901 | − struct IR *ir = (struct IR *)filep->private_data; | |
| 901 | + struct IR *ir = filep->private_data; | |
| 902 | 902 | size_t i; |
| 903 | 903 | int failures = 0; |
| 904 | 904 | |
| @@ -972,7 +972,7 @@ static ssize_t write(struct file *filep, const char *buf, size_t n, · 67 unmodified lines | ||
| 972 | 972 | /* copied from lirc_dev */ |
| 973 | 973 | static unsigned int poll(struct file *filep, poll_table *wait) |
| 974 | 974 | { |
| 975 | − struct IR *ir = (struct IR *)filep->private_data; | |
| 975 | + struct IR *ir = filep->private_data; | |
| 976 | 976 | unsigned int ret; |
| 977 | 977 | |
| 978 | 978 | dprintk("poll called\n"); |
| @@ -994,7 +994,7 @@ static unsigned int poll(struct file *filep, poll_table *wait) · 15 unmodified lines | ||
| 994 | 994 | |
| 995 | 995 | static long ioctl(struct file *filep, unsigned int cmd, unsigned long arg) |
| 996 | 996 | { |
| 997 | − struct IR *ir = (struct IR *)filep->private_data; | |
| 997 | + struct IR *ir = filep->private_data; | |
| 998 | 998 | int result; |
| 999 | 999 | unsigned long mode, features = 0; |
| 1000 | 1000 | |
| @@ -1086,7 +1086,7 @@ static int open(struct inode *node, struct file *filep) · 85 unmodified lines | ||
| 1086 | 1086 | static int close(struct inode *node, struct file *filep) |
| 1087 | 1087 | { |
| 1088 | 1088 | /* find our IR struct */ |
| 1089 | − struct IR *ir = (struct IR *)filep->private_data; | |
| 1089 | + struct IR *ir = filep->private_data; | |
| 1090 | 1090 | if (ir == NULL) { |
| 1091 | 1091 | zilog_error("close: no private_data attached to the file!\n"); |
| 1092 | 1092 | return -ENODEV; |