diff options
| author | Geliang Tang <geliangtang@gmail.com> | 2017-04-09 03:34:00 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-04-10 19:48:01 +0200 |
| commit | d720e055945ca039939b2a857b7c54d22de9dff7 (patch) | |
| tree | 015d3ae0c6ebb4e82ca2219eb9248d61725ecd66 /drivers/media/pci | |
| parent | [media] bt8xx: use setup_timer (diff) | |
| download | linux-d720e055945ca039939b2a857b7c54d22de9dff7.tar.xz linux-d720e055945ca039939b2a857b7c54d22de9dff7.zip | |
[media] cx18: use setup_timer
Use setup_timer() instead of init_timer() to simplify the code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci')
| -rw-r--r-- | drivers/media/pci/cx18/cx18-streams.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c index 7c9381448966..3c45e0071530 100644 --- a/drivers/media/pci/cx18/cx18-streams.c +++ b/drivers/media/pci/cx18/cx18-streams.c @@ -282,9 +282,7 @@ static void cx18_stream_init(struct cx18 *cx, int type) INIT_WORK(&s->out_work_order, cx18_out_work_handler); INIT_LIST_HEAD(&s->vb_capture); - s->vb_timeout.function = cx18_vb_timeout; - s->vb_timeout.data = (unsigned long)s; - init_timer(&s->vb_timeout); + setup_timer(&s->vb_timeout, cx18_vb_timeout, (unsigned long)s); spin_lock_init(&s->vb_lock); if (type == CX18_ENC_STREAM_TYPE_YUV) { spin_lock_init(&s->vbuf_q_lock); |