Commit d5d116c4 authored by Geliang Tang's avatar Geliang Tang Committed by Mauro Carvalho Chehab
Browse files

[media] saa7146: use setup_timer 



Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 9e2abdd5

drivers/media/common/saa7146/saa7146_vbi.c

+2 −3
Original line number Diff line number Diff line
@@ -365,9 +365,8 @@ static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv) 


	INIT_LIST_HEAD(&vv->vbi_dmaq.queue);



	init_timer(&vv->vbi_dmaq.timeout);

	vv->vbi_dmaq.timeout.function = saa7146_buffer_timeout;

	vv->vbi_dmaq.timeout.data     = (unsigned long)(&vv->vbi_dmaq);

	setup_timer(&vv->vbi_dmaq.timeout, saa7146_buffer_timeout,

		    (unsigned long)(&vv->vbi_dmaq));

	vv->vbi_dmaq.dev              = dev;



	init_waitqueue_head(&vv->vbi_wq);

drivers/media/common/saa7146/saa7146_video.c

+2 −3
Original line number Diff line number Diff line
@@ -1201,9 +1201,8 @@ static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv) 
{

	INIT_LIST_HEAD(&vv->video_dmaq.queue);



	init_timer(&vv->video_dmaq.timeout);

	vv->video_dmaq.timeout.function = saa7146_buffer_timeout;

	vv->video_dmaq.timeout.data     = (unsigned long)(&vv->video_dmaq);

	setup_timer(&vv->video_dmaq.timeout, saa7146_buffer_timeout,

		    (unsigned long)(&vv->video_dmaq));

	vv->video_dmaq.dev              = dev;



	/* set some default values */

CRA Git | Maintained and supported by SUSTech CRA and CCSE