diff options
| author | Muhammad Falak R Wani <falakreyaz@gmail.com> | 2016-05-11 19:25:01 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 17:20:09 +0200 |
| commit | 1735d9e97c66f867d3a45a2303bb3c59398d20f8 (patch) | |
| tree | 5e6d34f7547efe3532e40c95f597a6c09575b1b1 /drivers/staging/i4l | |
| parent | 8df7a2221ccfcfdb25c2d4668cd51d25e9b3e134 (diff) | |
| download | op-kernel-dev-1735d9e97c66f867d3a45a2303bb3c59398d20f8.zip op-kernel-dev-1735d9e97c66f867d3a45a2303bb3c59398d20f8.tar.gz | |
staging: i4l: pcbit: layer2: use setup_timer() and mod_timer().
Use setup_timer() instead of init_timer(), being the preferred/standard
way to set a timer up.
Also, quoting the mod_timer() function comment:
-> mod_timer() is a more efficient way to update the expire field of an
active timer (if the timer is inactive it will be activated).
Use setup_timer and mod_timer to setup and arm a timer, to make the code
cleaner and easier to read.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/i4l')
| -rw-r--r-- | drivers/staging/i4l/pcbit/layer2.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/i4l/pcbit/layer2.c b/drivers/staging/i4l/pcbit/layer2.c index 46e1240..a136c72 100644 --- a/drivers/staging/i4l/pcbit/layer2.c +++ b/drivers/staging/i4l/pcbit/layer2.c @@ -645,11 +645,9 @@ pcbit_l2_error(struct pcbit_dev *dev) dev->l2_state = L2_DOWN; - init_timer(&dev->error_recover_timer); - dev->error_recover_timer.function = &pcbit_l2_err_recover; - dev->error_recover_timer.data = (ulong) dev; - dev->error_recover_timer.expires = jiffies + ERRTIME; - add_timer(&dev->error_recover_timer); + setup_timer(&dev->error_recover_timer, &pcbit_l2_err_recover, + (ulong)dev); + mod_timer(&dev->error_recover_timer, jiffies + ERRTIME); } } |
