Skip to content

Commit

Permalink
net: hsr: convert to use new timer APIs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yu Liao authored and David S. Miller committed Oct 14, 2024
1 parent 6aac566 commit e4c4165
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/hsr/hsr_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit e4c4165

Please sign in to comment.