serial: sccnxp: Remove useless timer_pending() check
authorAlexander Shiyan <shc_work@mail.ru>
Sat, 24 May 2014 08:50:26 +0000 (12:50 +0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 May 2014 19:41:58 +0000 (12:41 -0700)
sccnxp_timer() is triggered only by timer, so there are no need to
check for timer_pending().

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sccnxp.c

index a447f71..3f5d40a 100644 (file)
@@ -474,9 +474,7 @@ static void sccnxp_timer(unsigned long data)
        sccnxp_handle_events(s);
        spin_unlock_irqrestore(&s->lock, flags);
 
-       if (!timer_pending(&s->timer))
-               mod_timer(&s->timer, jiffies +
-                         usecs_to_jiffies(s->pdata.poll_time_us));
+       mod_timer(&s->timer, jiffies + usecs_to_jiffies(s->pdata.poll_time_us));
 }
 
 static irqreturn_t sccnxp_ist(int irq, void *dev_id)