net: hsr: convert to use new timer APIs
del_timer() and del_timer_sync() have been renamed to timer_delete() and timer_delete_sync(). Inconsistent API usage makes the code a bit confusing, so replace with the new APIs. No functional changes intended. Signed-off-by: Yu Liao <liaoyu15@huawei.com> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -128,9 +128,9 @@ static void hsr_dellink(struct net_device *dev, struct list_head *head)
|
||||
{
|
||||
struct hsr_priv *hsr = netdev_priv(dev);
|
||||
|
||||
del_timer_sync(&hsr->prune_timer);
|
||||
del_timer_sync(&hsr->prune_proxy_timer);
|
||||
del_timer_sync(&hsr->announce_timer);
|
||||
timer_delete_sync(&hsr->prune_timer);
|
||||
timer_delete_sync(&hsr->prune_proxy_timer);
|
||||
timer_delete_sync(&hsr->announce_timer);
|
||||
timer_delete_sync(&hsr->announce_proxy_timer);
|
||||
|
||||
hsr_debugfs_term(hsr);
|
||||
|
||||
Reference in New Issue
Block a user