Skip to content

Commit f9fb14e

Browse files
committed
treewide: Switch/rename to timer_delete[_sync]()
Conflict: partial backport only includes i40e changes JIRA: https://issues.redhat.com/browse/RHEL-83569 commit 8fa7292 Author: Thomas Gleixner <tglx@linutronix.de> Date: Sat Apr 5 10:17:26 2025 +0200 treewide: Switch/rename to timer_delete[_sync]() timer_delete[_sync]() replaces del_timer[_sync](). Convert the whole tree over and remove the historical wrapper inlines. Conversion was done with coccinelle plus manual fixups where necessary. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Dennis Chen <dechen@redhat.com>
1 parent 7aa9dbe commit f9fb14e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/intel/i40e/i40e_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16382,7 +16382,7 @@ static int i40e_io_suspend(struct i40e_pf *pf)
1638216382
set_bit(__I40E_DOWN, pf->state);
1638316383

1638416384
/* Ensure service task will not be running */
16385-
del_timer_sync(&pf->service_timer);
16385+
timer_delete_sync(&pf->service_timer);
1638616386
cancel_work_sync(&pf->service_task);
1638716387

1638816388
/* Client close must be called explicitly here because the timer
@@ -16581,7 +16581,7 @@ static void i40e_shutdown(struct pci_dev *pdev)
1658116581
set_bit(__I40E_SUSPENDED, pf->state);
1658216582
set_bit(__I40E_DOWN, pf->state);
1658316583

16584-
del_timer_sync(&pf->service_timer);
16584+
timer_delete_sync(&pf->service_timer);
1658516585
cancel_work_sync(&pf->service_task);
1658616586
i40e_cloud_filter_exit(pf);
1658716587
i40e_fdir_teardown(pf);

0 commit comments

Comments
 (0)