| Message ID | 20240912033912.1019563-1-liaoyu15@huawei.com (mailing list archive) |
|---|---|
| State | Deferred |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: hsr: convert to use new timer API | expand |
On Thu, Sep 12, 2024 at 11:39:12AM +0800, Yu Liao wrote: > del_timer_sync() has been renamed to timer_delete_sync(). Inconsistent > API usage makes the code a bit confusing, so replace with the new API. > > No functional changes intended. > > Signed-off-by: Yu Liao <liaoyu15@huawei.com> Thanks, I agree that it is currently inconsistent. And that this patch addresses all relevant calls in this function. Reviewed-by: Simon Horman <horms@kernel.org>
On Thu, 12 Sep 2024 11:39:12 +0800 Yu Liao wrote: > del_timer_sync() has been renamed to timer_delete_sync(). Inconsistent > API usage makes the code a bit confusing, so replace with the new API. > > No functional changes intended We didn't merge this patch in time for 6.12, please repost in 2 weeks
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);
del_timer_sync() has been renamed to timer_delete_sync(). Inconsistent API usage makes the code a bit confusing, so replace with the new API. No functional changes intended. Signed-off-by: Yu Liao <liaoyu15@huawei.com> --- net/hsr/hsr_netlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)