diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2014-05-24 10:50:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-28 21:41:58 +0200 |
| commit | bee18bdc9c0f383428cbf8c955b7bb8e6cc0d090 (patch) | |
| tree | 2c012745d7204904d2570cfa96988454d92991c5 /drivers/tty/serial | |
| parent | serial: imx: disable the receiver ready interrupt for imx_stop_rx (diff) | |
| download | linux-bee18bdc9c0f383428cbf8c955b7bb8e6cc0d090.tar.xz linux-bee18bdc9c0f383428cbf8c955b7bb8e6cc0d090.zip | |
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 <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/sccnxp.c | 4 |
1 files changed, 1 insertions, 3 deletions
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) |