From: Jeff Johnson Date: Tue, 8 Apr 2025 16:14:12 +0000 (-0700) Subject: wifi: ath12k: ahb: Replace del_timer_sync() with timer_delete_sync() X-Git-Tag: v6.16-rc1~132^2~157^2~16^2~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25b2f46bd7de2f0007d742de9d2e72e65db0edf3;p=thirdparty%2Fkernel%2Flinux.git wifi: ath12k: ahb: Replace del_timer_sync() with timer_delete_sync() 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 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] Link: https://patch.msgid.link/20250408-timer_delete_sync-v1-1-4dcb22f71083@oss.qualcomm.com Signed-off-by: Jeff Johnson --- diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c index 1c2171e2bb73a..a9d9943a73f43 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); }