wifi: ath12k: introduce interface combination cleanup helper

Introduce a cleanup helper function to avoid redundant code for interface
combination cleanup. Remove the cleanup code from ath12k_mac_hw_unregister()
and ath12k_mac_hw_register() and replace it with a new cleanup helper function.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Link: https://patch.msgid.link/20241209185421.376381-5-kvalo@kernel.org
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index b946f889c4fe39dc60340b101f55b3412ed4f5ef..808af521c57c1765d95d7fc11b241e21d95dcce2 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -10351,6 +10351,14 @@ static bool ath12k_mac_is_iface_mode_enable(struct ath12k_hw *ah,
        return is_enable;
 }
 
+static void ath12k_mac_cleanup_iface_combinations(struct ath12k_hw *ah)
+{
+       struct wiphy *wiphy = ah->hw->wiphy;
+
+       kfree(wiphy->iface_combinations[0].limits);
+       kfree(wiphy->iface_combinations);
+}
+
 static int ath12k_mac_setup_iface_combinations(struct ath12k_hw *ah)
 {
        struct wiphy *wiphy = ah->hw->wiphy;
@@ -10479,7 +10487,6 @@ static void ath12k_mac_cleanup_unregister(struct ath12k *ar)
 static void ath12k_mac_hw_unregister(struct ath12k_hw *ah)
 {
        struct ieee80211_hw *hw = ah->hw;
-       struct wiphy *wiphy = hw->wiphy;
        struct ath12k *ar;
        int i;
 
@@ -10493,8 +10500,7 @@ static void ath12k_mac_hw_unregister(struct ath12k_hw *ah)
        for_each_ar(ah, ar, i)
                ath12k_mac_cleanup_unregister(ar);
 
-       kfree(wiphy->iface_combinations[0].limits);
-       kfree(wiphy->iface_combinations);
+       ath12k_mac_cleanup_iface_combinations(ah);
 
        SET_IEEE80211_DEV(hw, NULL);
 }
@@ -10724,13 +10730,13 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
        ret = ath12k_wow_init(ar);
        if (ret) {
                ath12k_warn(ar->ab, "failed to init wow: %d\n", ret);
-               goto err_free_if_combs;
+               goto err_cleanup_if_combs;
        }
 
        ret = ieee80211_register_hw(hw);
        if (ret) {
                ath12k_err(ab, "ieee80211 registration failed: %d\n", ret);
-               goto err_free_if_combs;
+               goto err_cleanup_if_combs;
        }
 
        if (is_monitor_disable)
@@ -10760,9 +10766,8 @@ err_unregister_hw:
 
        ieee80211_unregister_hw(hw);
 
-err_free_if_combs:
-       kfree(wiphy->iface_combinations[0].limits);
-       kfree(wiphy->iface_combinations);
+err_cleanup_if_combs:
+       ath12k_mac_cleanup_iface_combinations(ah);
 
 err_complete_cleanup_unregister:
        i = ah->num_radio;