diff options
| author | Yu Liao <liaoyu15@huawei.com> | 2024-10-10 17:27:44 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-10-14 13:17:04 +0100 |
| commit | e4c416533f0633c96eba849832a9212ace3c3ec4 (patch) | |
| tree | 24009c295989c5f405fb809fc5743ed3edb1f823 /net/hsr | |
| parent | 6aac56631831e1386b6edd3c583c8afb2abfd267 (diff) | |
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>
Diffstat (limited to 'net/hsr')
| -rw-r--r-- | net/hsr/hsr_netlink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c index f6ff0b61e08a..6f09b9512484 100644 --- a/net/hsr/hsr_netlink.c +++ b/net/hsr/hsr_netlink.c @@ -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); |