net: remove redundant check for timer pending state before del_timer

As in del_timer() there has already placed a timer_pending() function
to check whether the timer to be deleted is pending or not, it's
unnecessary to check timer pending state again before del_timer() is
called.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ying Xue
2013-02-03 20:32:57 +00:00
committed by David S. Miller
parent 2b3c9a850c
commit 25cc4ae913
11 changed files with 21 additions and 38 deletions

View File

@@ -2567,8 +2567,7 @@ bed:
err);
/* If watchdog is still activated, kill it! */
if(timer_pending(&(self->watchdog)))
del_timer(&(self->watchdog));
del_timer(&(self->watchdog));
IRDA_DEBUG(1, "%s(), ...waking up !\n", __func__);