diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-16 17:29:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-18 12:39:55 +0100 |
| commit | 9ba650a4ebdde5f5f59a62ed51563d7c4586e492 (patch) | |
| tree | a0c35347493c87125b8c27942b01f8fb5f6cd64b /drivers/net/appletalk | |
| parent | d26c089e78298843b8c5202ffb43146d17c15bde (diff) | |
| download | linux-stable-9ba650a4ebdde5f5f59a62ed51563d7c4586e492.tar.gz linux-stable-9ba650a4ebdde5f5f59a62ed51563d7c4586e492.tar.bz2 linux-stable-9ba650a4ebdde5f5f59a62ed51563d7c4586e492.zip | |
appletalk: Remove unneeded synchronization
The use of del_timer_sync() will make sure a timer is not rescheduled.
As such, there is no need to add external signals to kill timers. In
preparation for switching the timer callback argument to the timer
pointer, this drops the .data argument since it doesn't serve a meaningful
purpose here.
Cc: David Howells <dhowells@redhat.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/appletalk')
| -rw-r--r-- | drivers/net/appletalk/ltpc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index e4aa374caa4d..cc3dc9337eae 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c @@ -880,14 +880,10 @@ static void ltpc_poll(unsigned long l) } ltpc_poll_counter--; } - - if (!dev) - return; /* we've been downed */ /* poll 20 times per second */ idle(dev); ltpc_timer.expires = jiffies + HZ/20; - add_timer(<pc_timer); } @@ -1252,8 +1248,6 @@ static void __exit ltpc_cleanup(void) if(debug & DEBUG_VERBOSE) printk("unregister_netdev\n"); unregister_netdev(dev_ltpc); - ltpc_timer.data = 0; /* signal the poll routine that we're done */ - del_timer_sync(<pc_timer); if(debug & DEBUG_VERBOSE) printk("freeing irq\n"); |