diff options
| author | Geliang Tang <geliangtang@gmail.com> | 2017-04-08 22:33:58 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-04-10 14:46:12 -0300 |
| commit | d5d116c4db4f98e818e664fd62d011062e25b12e (patch) | |
| tree | 93b750d069692d8dbe1f2ab6a01a4ba8ef43b938 /drivers/media/common/saa7146/saa7146_video.c | |
| parent | 9e2abdd5bad651983358e5aef21892644a2683f6 (diff) | |
| download | lwn-d5d116c4db4f98e818e664fd62d011062e25b12e.tar.gz lwn-d5d116c4db4f98e818e664fd62d011062e25b12e.zip | |
[media] saa7146: 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/common/saa7146/saa7146_video.c')
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_video.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c index e034bcfcf757..b3b29d4f36ed 100644 --- a/drivers/media/common/saa7146/saa7146_video.c +++ b/drivers/media/common/saa7146/saa7146_video.c @@ -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 */ |