]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
appletalk: Remove unneeded synchronization
authorKees Cook <keescook@chromium.org>
Tue, 17 Oct 2017 00:29:23 +0000 (17:29 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Oct 2017 11:39:55 +0000 (12:39 +0100)
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>
drivers/net/appletalk/ltpc.c

index e4aa374caa4d5b7a65187e5c7b4f9743ba147b4b..cc3dc9337eaea2afb0ffe6e1570e7a6e9ce10bd5 100644 (file)
@@ -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(&ltpc_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(&ltpc_timer);
 
        if(debug & DEBUG_VERBOSE) printk("freeing irq\n");