staging: i4l: pcbit: edss1: 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>

diff --git a/drivers/staging/i4l/pcbit/edss1.c b/drivers/staging/i4l/pcbit/edss1.c
index e72c16420712c0a00cc9be91570503a921437c7c..6d291d548423cecda2966c03936027a698da3665 100644 (file)
--- a/drivers/staging/i4l/pcbit/edss1.c
+++ b/drivers/staging/i4l/pcbit/edss1.c
@@ -298,11 +298,8 @@ void pcbit_fsm_event(struct pcbit_dev *dev, struct pcbit_chan *chan,
                        break;
 
        if (tentry->init != 0xff) {
-               init_timer(&chan->fsm_timer);
-               chan->fsm_timer.function = &pcbit_fsm_timer;
-               chan->fsm_timer.data = (ulong) chan;
-               chan->fsm_timer.expires = jiffies + tentry->timeout * HZ;
-               add_timer(&chan->fsm_timer);
+               setup_timer(&chan->fsm_timer, &pcbit_fsm_timer, (ulong)chan);
+               mod_timer(&chan->fsm_timer, jiffies + tentry->timeout * HZ);
        }
 
        spin_unlock_irqrestore(&dev->lock, flags);