From: Alexander Shiyan Date: Sat, 24 May 2014 08:50:26 +0000 (+0400) Subject: serial: sccnxp: Remove useless timer_pending() check X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bee18bdc9c0f383428cbf8c955b7bb8e6cc0d090;p=deliverable%2Flinux.git serial: sccnxp: Remove useless timer_pending() check sccnxp_timer() is triggered only by timer, so there are no need to check for timer_pending(). Signed-off-by: Alexander Shiyan Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c index a447f71538ef..3f5d40a060e0 100644 --- a/drivers/tty/serial/sccnxp.c +++ b/drivers/tty/serial/sccnxp.c @@ -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)