Skip to content

Commit ed58f82

Browse files
committed
treewide: Switch/rename to timer_delete[_sync]()
JIRA: https://issues.redhat.com/browse/RHEL-83573 Conflict: partial backport only includes i40e changes 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 4410506 commit ed58f82

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
@@ -16383,7 +16383,7 @@ static int i40e_io_suspend(struct i40e_pf *pf)
1638316383
set_bit(__I40E_DOWN, pf->state);
1638416384

1638516385
/* Ensure service task will not be running */
16386-
del_timer_sync(&pf->service_timer);
16386+
timer_delete_sync(&pf->service_timer);
1638716387
cancel_work_sync(&pf->service_task);
1638816388

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

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

0 commit comments

Comments
 (0)