UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Kees Cook 2017-10-16 19:10:42 -04:00 committed by Mauro Carvalho Chehab
parent a88cd60fc9
commit 12a83612ed
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/common/saa7146/saa7146_fops.c
View File

@ -163,9 +163,9 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
} }
} }
void saa7146_buffer_timeout(unsigned long data) void saa7146_buffer_timeout(struct timer_list *t)
{ {
struct saa7146_dmaqueue *q = (struct saa7146_dmaqueue*)data; struct saa7146_dmaqueue *q = from_timer(q, t, timeout);
struct saa7146_dev *dev = q->dev; struct saa7146_dev *dev = q->dev;
unsigned long flags; unsigned long flags;

3
drivers/media/common/saa7146/saa7146_vbi.c
View File

@ -366,8 +366,7 @@ static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
INIT_LIST_HEAD(&vv->vbi_dmaq.queue); INIT_LIST_HEAD(&vv->vbi_dmaq.queue);
setup_timer(&vv->vbi_dmaq.timeout, saa7146_buffer_timeout, timer_setup(&vv->vbi_dmaq.timeout, saa7146_buffer_timeout, 0);
(unsigned long)(&vv->vbi_dmaq));
vv->vbi_dmaq.dev = dev; vv->vbi_dmaq.dev = dev;
init_waitqueue_head(&vv->vbi_wq); init_waitqueue_head(&vv->vbi_wq);

3
drivers/media/common/saa7146/saa7146_video.c
View File

@ -1201,8 +1201,7 @@ static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
{ {
INIT_LIST_HEAD(&vv->video_dmaq.queue); INIT_LIST_HEAD(&vv->video_dmaq.queue);
setup_timer(&vv->video_dmaq.timeout, saa7146_buffer_timeout, timer_setup(&vv->video_dmaq.timeout, saa7146_buffer_timeout, 0);
(unsigned long)(&vv->video_dmaq));
vv->video_dmaq.dev = dev; vv->video_dmaq.dev = dev;
/* set some default values */ /* set some default values */

2
include/media/drv-intf/saa7146_vv.h
View File

@ -184,7 +184,7 @@ int saa7146_unregister_device(struct video_device *vid, struct saa7146_dev *dev)
void saa7146_buffer_finish(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, int state); void saa7146_buffer_finish(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, int state);
void saa7146_buffer_next(struct saa7146_dev *dev, struct saa7146_dmaqueue *q,int vbi); void saa7146_buffer_next(struct saa7146_dev *dev, struct saa7146_dmaqueue *q,int vbi);
int saa7146_buffer_queue(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, struct saa7146_buf *buf); int saa7146_buffer_queue(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, struct saa7146_buf *buf);
void saa7146_buffer_timeout(unsigned long data); void saa7146_buffer_timeout(struct timer_list *t);
void saa7146_dma_free(struct saa7146_dev* dev,struct videobuf_queue *q, void saa7146_dma_free(struct saa7146_dev* dev,struct videobuf_queue *q,
struct saa7146_buf *buf); struct saa7146_buf *buf);