Skip to contentSkip to conversation

wifi: ath12k: ahb: Replace del_timer_sync() with timer_delete_sync()

PATCH Applied Jeff Johnson 1 participant 2 messages Apr 8, 2025 – Apr 9, 2025 Qualcomm ATH12K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/net/wireless/ath/ath12k/ahb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/ahb.c +1 -1
index 1c2171e2bb73..a9d9943a73f4 100644
@@ -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);
 }
 

---
base-commit: ac17b1211841c98a9b4c2900ba2a7f457c80cf90
change-id: 20250408-timer_delete_sync-b6ca367d2daf

author Applied
#1 lore raw
Quoted 9 lines · Jeff Johnson

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,

Signature · 1 line
Jeff Johnson <[email protected]>