Skip to content

Commit aea4bd3

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

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/net/ethernet/amazon/ena/ena_netdev.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3275,7 +3275,7 @@ static int ena_destroy_device(struct ena_adapter *adapter, bool graceful)
32753275

32763276
netif_carrier_off(netdev);
32773277

3278-
del_timer_sync(&adapter->timer_service);
3278+
timer_delete_sync(&adapter->timer_service);
32793279

32803280
dev_up = test_bit(ENA_FLAG_DEV_UP, &adapter->flags);
32813281
adapter->dev_up_before_reset = dev_up;
@@ -4095,7 +4095,7 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
40954095
ena_free_mgmnt_irq(adapter);
40964096
ena_disable_msix(adapter);
40974097
err_worker_destroy:
4098-
del_timer(&adapter->timer_service);
4098+
timer_delete(&adapter->timer_service);
40994099
err_device_destroy:
41004100
ena_com_delete_host_info(ena_dev);
41014101
ena_com_admin_destroy(ena_dev);
@@ -4141,7 +4141,7 @@ static void __ena_shutoff(struct pci_dev *pdev, bool shutdown)
41414141
/* Make sure timer and reset routine won't be called after
41424142
* freeing device resources.
41434143
*/
4144-
del_timer_sync(&adapter->timer_service);
4144+
timer_delete_sync(&adapter->timer_service);
41454145
cancel_work_sync(&adapter->reset_task);
41464146

41474147
rtnl_lock(); /* lock released inside the below if-else block */

0 commit comments

Comments
 (0)