Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 80792d182e43bee89fce509e64fdea27e600530f

Authored by Joe Perches
Committed by Stefan Richter
1 parent 02d37bed18
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ieee1394: Remove unnecessary casts of private_data 

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

Showing 3 changed files with 7 additions and 7 deletions Side-by-side Diff

drivers/ieee1394/dv1394.c
Diff comments   View file @ 80792d1
... ... @@ -172,7 +172,7 @@
172 172  
173 173 static inline struct video_card* file_to_video_card(struct file *file)
174 174 {
175   - return (struct video_card*) file->private_data;
  175 + return file->private_data;
176 176 }
177 177  
178 178 /*** FRAME METHODS *********************************************************/
... ... @@ -1783,7 +1783,7 @@
1783 1783 struct video_card *video = NULL;
1784 1784  
1785 1785 if (file->private_data) {
1786   - video = (struct video_card*) file->private_data;
  1786 + video = file->private_data;
1787 1787  
1788 1788 } else {
1789 1789 /* look up the card by ID */
drivers/ieee1394/raw1394.c
Diff comments   View file @ 80792d1
... ... @@ -440,7 +440,7 @@
440 440 static ssize_t raw1394_read(struct file *file, char __user * buffer,
441 441 size_t count, loff_t * offset_is_ignored)
442 442 {
443   - struct file_info *fi = (struct file_info *)file->private_data;
  443 + struct file_info *fi = file->private_data;
444 444 struct pending_request *req;
445 445 ssize_t ret;
446 446  
... ... @@ -2244,7 +2244,7 @@
2244 2244 static ssize_t raw1394_write(struct file *file, const char __user * buffer,
2245 2245 size_t count, loff_t * offset_is_ignored)
2246 2246 {
2247   - struct file_info *fi = (struct file_info *)file->private_data;
  2247 + struct file_info *fi = file->private_data;
2248 2248 struct pending_request *req;
2249 2249 ssize_t retval = -EBADFD;
2250 2250  
drivers/ieee1394/video1394.c
Diff comments   View file @ 80792d1
... ... @@ -720,7 +720,7 @@
720 720 static long video1394_ioctl(struct file *file,
721 721 unsigned int cmd, unsigned long arg)
722 722 {
723   - struct file_ctx *ctx = (struct file_ctx *)file->private_data;
  723 + struct file_ctx *ctx = file->private_data;
724 724 struct ti_ohci *ohci = ctx->ohci;
725 725 unsigned long flags;
726 726 void __user *argp = (void __user *)arg;
... ... @@ -1172,7 +1172,7 @@
1172 1172  
1173 1173 static int video1394_mmap(struct file *file, struct vm_area_struct *vma)
1174 1174 {
1175   - struct file_ctx *ctx = (struct file_ctx *)file->private_data;
  1175 + struct file_ctx *ctx = file->private_data;
1176 1176  
1177 1177 if (ctx->current_ctx == NULL) {
1178 1178 PRINT(KERN_ERR, ctx->ohci->host->id,
... ... @@ -1239,7 +1239,7 @@
1239 1239  
1240 1240 static int video1394_release(struct inode *inode, struct file *file)
1241 1241 {
1242   - struct file_ctx *ctx = (struct file_ctx *)file->private_data;
  1242 + struct file_ctx *ctx = file->private_data;
1243 1243 struct ti_ohci *ohci = ctx->ohci;
1244 1244 struct list_head *lh, *next;
1245 1245 u64 mask;