From: Yu Liao Date: Thu, 10 Oct 2024 09:27:44 +0000 (+0800) Subject: net: hsr: convert to use new timer APIs X-Git-Tag: v6.13-rc1~135^2~339 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4c416533f0633c96eba849832a9212ace3c3ec4;p=thirdparty%2Fkernel%2Flinux.git 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 Reviewed-by: Simon Horman Signed-off-by: David S. Miller --- diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c index f6ff0b61e08a9..6f09b9512484a 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);