diff options
| author | Ying Xue <ying.xue@windriver.com> | 2013-02-03 20:32:57 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-04 13:26:49 -0500 |
| commit | 25cc4ae913a46bcc11b03c37bec59568f2122a36 (patch) | |
| tree | 0a69dfa2c245d48fb44c6f2ab8e93587cf8516a7 /net/irda/af_irda.c | |
| parent | 2b3c9a850c3f2da7430c39dde0fb5cab56f8501d (diff) | |
| download | linux-25cc4ae913a46bcc11b03c37bec59568f2122a36.tar.bz2 | |
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>
Diffstat (limited to 'net/irda/af_irda.c')
| -rw-r--r-- | net/irda/af_irda.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index b833677d83d6..d07e3a626446 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -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__); |