Skip to content

Commit 50e2ae1

Browse files
committed
treewide: Switch/rename to timer_delete[_sync]()
Author: Thomas Gleixner <tglx@linutronix.de> 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> (cherry picked from commit 8fa7292) JIRA: https://issues.redhat.com/browse/RHEL-99399 Conflicts: Partial backport only Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
1 parent 5036565 commit 50e2ae1

File tree

1 file changed

+4
-4
lines changed
  • drivers/net/ethernet/intel/e1000e

1 file changed

+4
-4
lines changed

drivers/net/ethernet/intel/e1000e/netdev.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4287,8 +4287,8 @@ void e1000e_down(struct e1000_adapter *adapter, bool reset)
42874287

42884288
napi_synchronize(&adapter->napi);
42894289

4290-
del_timer_sync(&adapter->watchdog_timer);
4291-
del_timer_sync(&adapter->phy_info_timer);
4290+
timer_delete_sync(&adapter->watchdog_timer);
4291+
timer_delete_sync(&adapter->phy_info_timer);
42924292

42934293
spin_lock(&adapter->stats64_lock);
42944294
e1000e_update_stats(adapter);
@@ -7741,8 +7741,8 @@ static void e1000_remove(struct pci_dev *pdev)
77417741
* from being rescheduled.
77427742
*/
77437743
set_bit(__E1000_DOWN, &adapter->state);
7744-
del_timer_sync(&adapter->watchdog_timer);
7745-
del_timer_sync(&adapter->phy_info_timer);
7744+
timer_delete_sync(&adapter->watchdog_timer);
7745+
timer_delete_sync(&adapter->phy_info_timer);
77467746

77477747
cancel_work_sync(&adapter->reset_task);
77487748
cancel_work_sync(&adapter->watchdog_task);

0 commit comments

Comments
 (0)