Skip to content

Commit 6fb8f60

Browse files
committed
treewide: Switch/rename to timer_delete[_sync]()
JIRA: https://issues.redhat.com/browse/RHEL-72659 Conflicts: only includes sfc hunks 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 6406867 commit 6fb8f60

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

drivers/net/ethernet/sfc/falcon/falcon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2657,7 +2657,7 @@ void falcon_stop_nic_stats(struct ef4_nic *efx)
26572657
++nic_data->stats_disable_count;
26582658
spin_unlock_bh(&efx->stats_lock);
26592659

2660-
del_timer_sync(&nic_data->stats_timer);
2660+
timer_delete_sync(&nic_data->stats_timer);
26612661

26622662
/* Wait enough time for the most recent transfer to
26632663
* complete. */

drivers/net/ethernet/sfc/falcon/rx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ void ef4_fini_rx_queue(struct ef4_rx_queue *rx_queue)
791791
netif_dbg(rx_queue->efx, drv, rx_queue->efx->net_dev,
792792
"shutting down RX queue %d\n", ef4_rx_queue_index(rx_queue));
793793

794-
del_timer_sync(&rx_queue->slow_fill);
794+
timer_delete_sync(&rx_queue->slow_fill);
795795

796796
/* Release RX buffers from the current read ptr to the write ptr */
797797
if (rx_queue->buffer) {

drivers/net/ethernet/sfc/mcdi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ static bool efx_mcdi_complete_async(struct efx_mcdi_iface *mcdi, bool timeout)
530530
* of it aborting the next request.
531531
*/
532532
if (!timeout)
533-
del_timer_sync(&mcdi->async_timer);
533+
timer_delete_sync(&mcdi->async_timer);
534534

535535
spin_lock(&mcdi->async_lock);
536536
async = list_first_entry(&mcdi->async_list,
@@ -1122,7 +1122,7 @@ void efx_mcdi_flush_async(struct efx_nic *efx)
11221122
/* We must be in poll or fail mode so no more requests can be queued */
11231123
BUG_ON(mcdi->mode == MCDI_MODE_EVENTS);
11241124

1125-
del_timer_sync(&mcdi->async_timer);
1125+
timer_delete_sync(&mcdi->async_timer);
11261126

11271127
/* If a request is still running, make sure we give the MC
11281128
* time to complete it so that the response won't overwrite our

drivers/net/ethernet/sfc/rx_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ void efx_fini_rx_queue(struct efx_rx_queue *rx_queue)
285285
netif_dbg(rx_queue->efx, drv, rx_queue->efx->net_dev,
286286
"shutting down RX queue %d\n", efx_rx_queue_index(rx_queue));
287287

288-
del_timer_sync(&rx_queue->slow_fill);
288+
timer_delete_sync(&rx_queue->slow_fill);
289289
if (rx_queue->grant_credits)
290290
flush_work(&rx_queue->grant_work);
291291

drivers/net/ethernet/sfc/siena/mcdi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ static bool efx_mcdi_complete_async(struct efx_mcdi_iface *mcdi, bool timeout)
534534
* of it aborting the next request.
535535
*/
536536
if (!timeout)
537-
del_timer_sync(&mcdi->async_timer);
537+
timer_delete_sync(&mcdi->async_timer);
538538

539539
spin_lock(&mcdi->async_lock);
540540
async = list_first_entry(&mcdi->async_list,
@@ -1145,7 +1145,7 @@ void efx_siena_mcdi_flush_async(struct efx_nic *efx)
11451145
/* We must be in poll or fail mode so no more requests can be queued */
11461146
BUG_ON(mcdi->mode == MCDI_MODE_EVENTS);
11471147

1148-
del_timer_sync(&mcdi->async_timer);
1148+
timer_delete_sync(&mcdi->async_timer);
11491149

11501150
/* If a request is still running, make sure we give the MC
11511151
* time to complete it so that the response won't overwrite our

drivers/net/ethernet/sfc/siena/rx_common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ void efx_siena_fini_rx_queue(struct efx_rx_queue *rx_queue)
284284
netif_dbg(rx_queue->efx, drv, rx_queue->efx->net_dev,
285285
"shutting down RX queue %d\n", efx_rx_queue_index(rx_queue));
286286

287-
del_timer_sync(&rx_queue->slow_fill);
287+
timer_delete_sync(&rx_queue->slow_fill);
288288

289289
/* Release RX buffers from the current read ptr to the write ptr */
290290
if (rx_queue->buffer) {

0 commit comments

Comments
 (0)