[RESEND PATCH v2] net: hsr: convert to use new timer APIs

[RESEND PATCH v2] net: hsr: convert to use new timer APIs

[Yu Liao]

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>
---
v1 -> v2: Add Simon's Reviewed-by tag.

 net/hsr/hsr_netlink.c | 6 +++---
 1 file 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);
-- 
2.33.0

Re: [RESEND PATCH v2] net: hsr: convert to use new timer APIs

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by David S. Miller <davem@davemloft.net>:

On Thu, 10 Oct 2024 17:27:44 +0800 you wrote:
> 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.
> 
> [...]

Here is the summary with links:
  - [RESEND,v2] net: hsr: convert to use new timer APIs
    https://git.kernel.org/netdev/net-next/c/e4c416533f06

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html