wifi: ath11k: workaround too long expansion sparse warnings

In v6.7-rc1 sparse warns:

drivers/net/wireless/ath/ath11k/mac.c:4702:15: error: too long token expansion
drivers/net/wireless/ath/ath11k/mac.c:4702:15: error: too long token expansion
drivers/net/wireless/ath/ath11k/mac.c:8393:23: error: too long token expansion
drivers/net/wireless/ath/ath11k/mac.c:8393:23: error: too long token expansion

Workaround the warnings by refactoring the code to a new function, which also
reduces code duplication. And in the new function use max3() to make the code
more readable.

No functional changes, compile tested only.

Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20231214161740.1582340-1-kvalo@kernel.org

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 7f7b39817773777a1b89b5e9b3dc8dc8cb935137..db241589424d519607429b34ffd9946b32c525a9 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -4654,6 +4654,14 @@ static int ath11k_station_disassoc(struct ath11k *ar,
        return 0;
 }
 
+static u32 ath11k_mac_max_nss(const u8 *ht_mcs_mask, const u16 *vht_mcs_mask,
+                             const u16 *he_mcs_mask)
+{
+       return max3(ath11k_mac_max_ht_nss(ht_mcs_mask),
+                   ath11k_mac_max_vht_nss(vht_mcs_mask),
+                   ath11k_mac_max_he_nss(he_mcs_mask));
+}
+
 static void ath11k_sta_rc_update_wk(struct work_struct *wk)
 {
        struct ath11k *ar;
@@ -4699,9 +4707,7 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk)
        mutex_lock(&ar->conf_mutex);
 
        nss = max_t(u32, 1, nss);
-       nss = min(nss, max(max(ath11k_mac_max_ht_nss(ht_mcs_mask),
-                              ath11k_mac_max_vht_nss(vht_mcs_mask)),
-                          ath11k_mac_max_he_nss(he_mcs_mask)));
+       nss = min(nss, ath11k_mac_max_nss(ht_mcs_mask, vht_mcs_mask, he_mcs_mask));
 
        if (changed & IEEE80211_RC_BW_CHANGED) {
                /* Get the peer phymode */
@@ -8391,9 +8397,7 @@ ath11k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,
                        ath11k_warn(ar->ab,
                                    "could not update fixed rate settings to all peers due to mcs/nss incompatibility\n");
                nss = min_t(u32, ar->num_tx_chains,
-                           max(max(ath11k_mac_max_ht_nss(ht_mcs_mask),
-                                   ath11k_mac_max_vht_nss(vht_mcs_mask)),
-                               ath11k_mac_max_he_nss(he_mcs_mask)));
+                           ath11k_mac_max_nss(ht_mcs_mask, vht_mcs_mask, he_mcs_mask));
 
                /* If multiple rates across different preambles are given
                 * we can reconfigure this info with all peers using PEER_ASSOC