Skip to content

Commit

Permalink
appletalk: Remove unneeded synchronization
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kees Cook authored and David S. Miller committed Oct 18, 2017
1 parent d26c089 commit 9ba650a
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/net/appletalk/ltpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit 9ba650a

Please sign in to comment.