| Message ID | 20250408-timer_delete_sync-v1-1-4dcb22f71083@oss.qualcomm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Johnson |
| Headers | show |
| Series | [ath-next] wifi: ath12k: ahb: Replace del_timer_sync() with timer_delete_sync() | expand |
On Tue, 08 Apr 2025 09:14:12 -0700, Jeff Johnson wrote: > A linux-next build error was reported in [1]. > > This is the result of a treewide timer cleanup [2]. > > The ath12k AHB support has not yet landed in the tree where the > cleanup occurred, and hence a new call to del_timer_sync() was not > addressed by the treewide cleanup. > > [...] Applied, thanks! [1/1] wifi: ath12k: ahb: Replace del_timer_sync() with timer_delete_sync() commit: 25b2f46bd7de2f0007d742de9d2e72e65db0edf3 Best regards,
diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c index 1c2171e2bb73..a9d9943a73f4 100644 --- a/drivers/net/wireless/ath/ath12k/ahb.c +++ b/drivers/net/wireless/ath/ath12k/ahb.c @@ -334,7 +334,7 @@ static void ath12k_ahb_stop(struct ath12k_base *ab) ath12k_ahb_ce_irqs_disable(ab); ath12k_ahb_sync_ce_irqs(ab); ath12k_ahb_cancel_workqueue(ab); - del_timer_sync(&ab->rx_replenish_retry); + timer_delete_sync(&ab->rx_replenish_retry); ath12k_ce_cleanup_pipes(ab); }
A linux-next build error was reported in [1]. This is the result of a treewide timer cleanup [2]. The ath12k AHB support has not yet landed in the tree where the cleanup occurred, and hence a new call to del_timer_sync() was not addressed by the treewide cleanup. So fix that one instance. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Closes: https://msgid.link/20250408105146.459dfcf5@canb.auug.org.au # [1] Link: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=8fa7292fee5c5240402371ea89ab285ec856c916 # [2] Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com> --- drivers/net/wireless/ath/ath12k/ahb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: ac17b1211841c98a9b4c2900ba2a7f457c80cf90 change-id: 20250408-timer_delete_sync-b6ca367d2daf