diff options
| author | Geliang Tang <geliangtang@gmail.com> | 2017-04-08 22:33:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-04-10 14:46:46 -0300 |
| commit | 60221ffd8710b038ed147f991c68a97459a8f738 (patch) | |
| tree | 2924c043b126c506d8b39817cd6047cbd3e27a0e /drivers | |
| parent | d5d116c4db4f98e818e664fd62d011062e25b12e (diff) | |
| download | linux-stable-60221ffd8710b038ed147f991c68a97459a8f738.tar.gz linux-stable-60221ffd8710b038ed147f991c68a97459a8f738.tar.bz2 linux-stable-60221ffd8710b038ed147f991c68a97459a8f738.zip | |
[media] bt8xx: 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')
| -rw-r--r-- | drivers/media/pci/bt8xx/bttv-driver.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index fb4aefbcc8f8..ed319f18ba48 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -4043,9 +4043,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) INIT_LIST_HEAD(&btv->capture); INIT_LIST_HEAD(&btv->vcapture); - init_timer(&btv->timeout); - btv->timeout.function = bttv_irq_timeout; - btv->timeout.data = (unsigned long)btv; + setup_timer(&btv->timeout, bttv_irq_timeout, (unsigned long)btv); btv->i2c_rc = -1; btv->tuner_type = UNSET; |