aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-07-12 16:50:00 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2010-07-13 03:59:32 -0400
commit80792d182e43bee89fce509e64fdea27e600530f (patch)
tree058b752acfb8089f8ff000ffecc5842c20996b84 /drivers/ieee1394
parent02d37bed188c500ee7afb0a2dc6b65a80704c58e (diff)
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>
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/dv1394.c4
-rw-r--r--drivers/ieee1394/raw1394.c4
-rw-r--r--drivers/ieee1394/video1394.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index f8fcbd048447..c5a031b79d03 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -172,7 +172,7 @@ static DEFINE_SPINLOCK(dv1394_cards_lock);
172 172
173static inline struct video_card* file_to_video_card(struct file *file) 173static 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/*** FRAME METHODS *********************************************************/ 178/*** FRAME METHODS *********************************************************/
@@ -1783,7 +1783,7 @@ static int dv1394_open(struct inode *inode, struct file *file)
1783 struct video_card *video = NULL; 1783 struct video_card *video = NULL;
1784 1784
1785 if (file->private_data) { 1785 if (file->private_data) {
1786 video = (struct video_card*) file->private_data; 1786 video = file->private_data;
1787 1787
1788 } else { 1788 } else {
1789 /* look up the card by ID */ 1789 /* look up the card by ID */
diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c
index 2c417ae7622b..f3401427404c 100644
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
@@ -440,7 +440,7 @@ static struct pending_request *next_complete_req(struct file_info *fi)
440static ssize_t raw1394_read(struct file *file, char __user * buffer, 440static ssize_t raw1394_read(struct file *file, char __user * buffer,
441 size_t count, loff_t * offset_is_ignored) 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 struct pending_request *req; 444 struct pending_request *req;
445 ssize_t ret; 445 ssize_t ret;
446 446
@@ -2244,7 +2244,7 @@ static int state_connected(struct file_info *fi, struct pending_request *req)
2244static ssize_t raw1394_write(struct file *file, const char __user * buffer, 2244static ssize_t raw1394_write(struct file *file, const char __user * buffer,
2245 size_t count, loff_t * offset_is_ignored) 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 struct pending_request *req; 2248 struct pending_request *req;
2249 ssize_t retval = -EBADFD; 2249 ssize_t retval = -EBADFD;
2250 2250
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index a77483befcda..5c74f796d7f1 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -720,7 +720,7 @@ static inline unsigned video1394_buffer_state(struct dma_iso_ctx *d,
720static long video1394_ioctl(struct file *file, 720static long video1394_ioctl(struct file *file,
721 unsigned int cmd, unsigned long arg) 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 struct ti_ohci *ohci = ctx->ohci; 724 struct ti_ohci *ohci = ctx->ohci;
725 unsigned long flags; 725 unsigned long flags;
726 void __user *argp = (void __user *)arg; 726 void __user *argp = (void __user *)arg;
@@ -1172,7 +1172,7 @@ static long video1394_ioctl(struct file *file,
1172 1172
1173static int video1394_mmap(struct file *file, struct vm_area_struct *vma) 1173static 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 if (ctx->current_ctx == NULL) { 1177 if (ctx->current_ctx == NULL) {
1178 PRINT(KERN_ERR, ctx->ohci->host->id, 1178 PRINT(KERN_ERR, ctx->ohci->host->id,
@@ -1239,7 +1239,7 @@ static int video1394_open(struct inode *inode, struct file *file)
1239 1239
1240static int video1394_release(struct inode *inode, struct file *file) 1240static 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 struct ti_ohci *ohci = ctx->ohci; 1243 struct ti_ohci *ohci = ctx->ohci;
1244 struct list_head *lh, *next; 1244 struct list_head *lh, *next;
1245 u64 mask; 1245 u64 mask;