diff options
| author |   Geliang Tang <geliangtang@gmail.com> | 2017-04-08 22:33:57 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-04-10 14:45:05 -0300 |
| commit | 9e2abdd5bad651983358e5aef21892644a2683f6 (patch) | |
| tree | 06d34e8c54d4567c00d609ab4ad4e83f504381a0 /drivers/media/pci/saa7134/saa7134-video.c | |
| parent | [media] media: bcm2048: fix several macros (diff) | |
| download | linux-dev-9e2abdd5bad651983358e5aef21892644a2683f6.tar.xz linux-dev-9e2abdd5bad651983358e5aef21892644a2683f6.zip | |
[media] saa7134: 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/saa7134/saa7134-video.c')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-video.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c index 4b1c4327f112..51d42bbf969e 100644 --- a/drivers/media/pci/saa7134/saa7134-video.c +++ b/drivers/media/pci/saa7134/saa7134-video.c @@ -2145,9 +2145,8 @@ int saa7134_video_init1(struct saa7134_dev *dev) dev->automute = 0; INIT_LIST_HEAD(&dev->video_q.queue); - init_timer(&dev->video_q.timeout); - dev->video_q.timeout.function = saa7134_buffer_timeout; - dev->video_q.timeout.data = (unsigned long)(&dev->video_q); + setup_timer(&dev->video_q.timeout, saa7134_buffer_timeout, + (unsigned long)(&dev->video_q)); dev->video_q.dev = dev; dev->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24); dev->width = 720; |