Commit abf84383 authored by Joe Perches's avatar Joe Perches Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: drivers/media: Remove unnecessary casts of private_data 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarJarod Wilson <jarod@redhat.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1676e4ab

drivers/media/IR/imon.c

+3 −3
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static int display_close(struct inode *inode, struct file *file) 
	struct imon_context *ictx = NULL;

	int retval = 0;



	ictx = (struct imon_context *)file->private_data;

	ictx = file->private_data;



	if (!ictx) {

		err("%s: no context for device", __func__);
@@ -812,7 +812,7 @@ static ssize_t vfd_write(struct file *file, const char *buf, 
	const unsigned char vfd_packet6[] = {

		0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };



	ictx = (struct imon_context *)file->private_data;

	ictx = file->private_data;

	if (!ictx) {

		err("%s: no context for device", __func__);

		return -ENODEV;
@@ -896,7 +896,7 @@ static ssize_t lcd_write(struct file *file, const char *buf, 
	int retval = 0;

	struct imon_context *ictx;



	ictx = (struct imon_context *)file->private_data;

	ictx = file->private_data;

	if (!ictx) {

		err("%s: no context for device", __func__);

		return -ENODEV;

drivers/media/common/saa7146_vbi.c

+2 −2
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv) 


static int vbi_open(struct saa7146_dev *dev, struct file *file)

{

	struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;

	struct saa7146_fh *fh = file->private_data;



	u32 arbtr_ctrl	= saa7146_read(dev, PCI_BT_V1);

	int ret = 0;
@@ -437,7 +437,7 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) 


static void vbi_close(struct saa7146_dev *dev, struct file *file)

{

	struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_vv *vv = dev->vv_data;

	DEB_VBI(("dev:%p, fh:%p\n",dev,fh));

drivers/media/common/saa7146_video.c

+2 −2
Original line number Diff line number Diff line
@@ -1370,7 +1370,7 @@ static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv) 


static int video_open(struct saa7146_dev *dev, struct file *file)

{

	struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_format *sfmt;



	fh->video_fmt.width = 384;
@@ -1394,7 +1394,7 @@ static int video_open(struct saa7146_dev *dev, struct file *file) 


static void video_close(struct saa7146_dev *dev, struct file *file)

{

	struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_vv *vv = dev->vv_data;

	struct videobuf_queue *q = &fh->video_q;

	int err;

drivers/media/dvb/bt8xx/dst_ca.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct 
	int result = 0;



	lock_kernel();

	dvbdev = (struct dvb_device *)file->private_data;

	dvbdev = file->private_data;

	state = (struct dst_state *)dvbdev->priv;

	p_ca_message = kmalloc(sizeof (struct ca_msg), GFP_KERNEL);

	p_ca_slot_info = kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL);

drivers/media/video/cx18/cx18-ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ long cx18_v4l2_ioctl(struct file *filp, unsigned int cmd, 
		    unsigned long arg)

{

	struct video_device *vfd = video_devdata(filp);

	struct cx18_open_id *id = (struct cx18_open_id *)filp->private_data;

	struct cx18_open_id *id = filp->private_data;

	struct cx18 *cx = id->cx;

	long res;