diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-16 19:10:42 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-10-31 06:40:08 -0400 |
| commit | 12a83612ed23fccafe168828cafcce514f02e74d (patch) | |
| tree | a4d5422b870ed3b2759f21077fcd5fe23baea2f8 /drivers/media/common/saa7146/saa7146_video.c | |
| parent | a88cd60fc94e7e04e61adeb1c6f6ba16031913f8 (diff) | |
| download | linux-12a83612ed23fccafe168828cafcce514f02e74d.tar.bz2 | |
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>
Diffstat (limited to 'drivers/media/common/saa7146/saa7146_video.c')
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_video.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c index 51eeed830de4..2b631eaa65b3 100644 --- a/drivers/media/common/saa7146/saa7146_video.c +++ b/drivers/media/common/saa7146/saa7146_video.c @@ -1201,8 +1201,7 @@ static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv) { INIT_LIST_HEAD(&vv->video_dmaq.queue); - setup_timer(&vv->video_dmaq.timeout, saa7146_buffer_timeout, - (unsigned long)(&vv->video_dmaq)); + timer_setup(&vv->video_dmaq.timeout, saa7146_buffer_timeout, 0); vv->video_dmaq.dev = dev; /* set some default values */ |