Commit 3e314917 authored by Kees Cook's avatar Kees Cook Committed by Mauro Carvalho Chehab
Browse files

media: media/saa7146: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. This requires adding a pointer to
hold the timer's target file, as there won't be a way to pass this in the
future.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 82fad476

drivers/media/common/saa7146/saa7146_fops.c

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv) 
	vbi->start[1] = 312;

	vbi->count[1] = 16;



	init_timer(&vv->vbi_read_timeout);

	timer_setup(&vv->vbi_read_timeout, NULL, 0);



	vv->ov_fb.capability = V4L2_FBUF_CAP_LIST_CLIPPING;

	vv->ov_fb.flags = V4L2_FBUF_FLAG_PRIMARY;

drivers/media/common/saa7146/saa7146_vbi.c

+5 −4
Original line number Diff line number Diff line
@@ -348,9 +348,10 @@ static void vbi_stop(struct saa7146_fh *fh, struct file *file) 
	spin_unlock_irqrestore(&dev->slock, flags);

}



static void vbi_read_timeout(unsigned long data)

static void vbi_read_timeout(struct timer_list *t)

{

	struct file *file = (struct file*)data;

	struct saa7146_vv *vv = from_timer(vv, t, vbi_read_timeout);

	struct file *file = vv->vbi_read_timeout_file;

	struct saa7146_fh *fh = file->private_data;

	struct saa7146_dev *dev = fh->dev;
@@ -401,8 +402,8 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) 
			    sizeof(struct saa7146_buf),

			    file, &dev->v4l2_lock);



	vv->vbi_read_timeout.function = vbi_read_timeout;

	vv->vbi_read_timeout.data = (unsigned long)file;

	vv->vbi_read_timeout.function = (TIMER_FUNC_TYPE)vbi_read_timeout;

	vv->vbi_read_timeout_file = file;



	/* initialize the brs */

	if ( 0 != (SAA7146_USE_PORT_B_FOR_VBI & dev->ext_vv_data->flags)) {

include/media/drv-intf/saa7146_vv.h

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ struct saa7146_vv 
	struct saa7146_dmaqueue		vbi_dmaq;

	struct v4l2_vbi_format		vbi_fmt;

	struct timer_list		vbi_read_timeout;

	struct file			*vbi_read_timeout_file;

	/* vbi workaround interrupt queue */

	wait_queue_head_t		vbi_wq;

	int				vbi_fieldcount;