Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80792d18 authored by Joe Perches's avatar Joe Perches Committed by Stefan Richter
Browse files

ieee1394: Remove unnecessary casts of private_data 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 02d37bed

drivers/ieee1394/dv1394.c

+2 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static DEFINE_SPINLOCK(dv1394_cards_lock); 


static inline struct video_card* file_to_video_card(struct file *file)

{

	return (struct video_card*) file->private_data;

	return file->private_data;

}



/*** FRAME METHODS *********************************************************/
@@ -1783,7 +1783,7 @@ static int dv1394_open(struct inode *inode, struct file *file) 
	struct video_card *video = NULL;



	if (file->private_data) {

		video = (struct video_card*) file->private_data;

		video = file->private_data;



	} else {

		/* look up the card by ID */

drivers/ieee1394/raw1394.c

+2 −2
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static struct pending_request *next_complete_req(struct file_info *fi) 
static ssize_t raw1394_read(struct file *file, char __user * buffer,

			    size_t count, loff_t * offset_is_ignored)

{

	struct file_info *fi = (struct file_info *)file->private_data;

	struct file_info *fi = file->private_data;

	struct pending_request *req;

	ssize_t ret;
@@ -2244,7 +2244,7 @@ static int state_connected(struct file_info *fi, struct pending_request *req) 
static ssize_t raw1394_write(struct file *file, const char __user * buffer,

			     size_t count, loff_t * offset_is_ignored)

{

	struct file_info *fi = (struct file_info *)file->private_data;

	struct file_info *fi = file->private_data;

	struct pending_request *req;

	ssize_t retval = -EBADFD;

drivers/ieee1394/video1394.c

+3 −3
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ static inline unsigned video1394_buffer_state(struct dma_iso_ctx *d, 
static long video1394_ioctl(struct file *file,

			    unsigned int cmd, unsigned long arg)

{

	struct file_ctx *ctx = (struct file_ctx *)file->private_data;

	struct file_ctx *ctx = file->private_data;

	struct ti_ohci *ohci = ctx->ohci;

	unsigned long flags;

	void __user *argp = (void __user *)arg;
@@ -1172,7 +1172,7 @@ static long video1394_ioctl(struct file *file, 


static int video1394_mmap(struct file *file, struct vm_area_struct *vma)

{

	struct file_ctx *ctx = (struct file_ctx *)file->private_data;

	struct file_ctx *ctx = file->private_data;



	if (ctx->current_ctx == NULL) {

		PRINT(KERN_ERR, ctx->ohci->host->id,
@@ -1239,7 +1239,7 @@ static int video1394_open(struct inode *inode, struct file *file) 


static int video1394_release(struct inode *inode, struct file *file)

{

	struct file_ctx *ctx = (struct file_ctx *)file->private_data;

	struct file_ctx *ctx = file->private_data;

	struct ti_ohci *ohci = ctx->ohci;

	struct list_head *lh, *next;

	u64 mask;