wifi: ath11k: Really consistently use ath11k_vif_to_arvif()

Commit 9476cda44c13 ("wifi: ath11k: Consistently use ath11k_vif_to_arvif()")
previously replaced all open coding of the ath11k_vif_to_arvif()
functionality. Subsequently two more instances of open coding were
introduced, one in commit 92425f788fee ("wifi: ath11k: fill parameters for
vdev set tpc power WMI command") and one in commit 6f4e235be655 ("wifi:
ath11k: add parse of transmit power envelope element"), so fix those as
well.

No functional changes, compile tested only.

Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240205-ath11k_vif_to_arvif-v1-1-7c41313c8318@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index dc2bf13f00c17e5d3ddbf66c7eab12bd0a78b7f5..be04f823566f5459e1be0de55da8717d2c276ea8 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -7590,7 +7590,7 @@ void ath11k_mac_fill_reg_tpc_info(struct ath11k *ar,
                                  struct ieee80211_chanctx_conf *ctx)
 {
        struct ath11k_base *ab = ar->ab;
-       struct ath11k_vif *arvif = (void *)vif->drv_priv;
+       struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
        struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
        struct ath11k_reg_tpc_power_info *reg_tpc_info = &arvif->reg_tpc_info;
        struct ieee80211_channel *chan, *temp_chan;
@@ -7764,7 +7764,7 @@ static void ath11k_mac_parse_tx_pwr_env(struct ath11k *ar,
                                        struct ieee80211_chanctx_conf *ctx)
 {
        struct ath11k_base *ab = ar->ab;
-       struct ath11k_vif *arvif = (void *)vif->drv_priv;
+       struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif);
        struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
        struct ieee80211_tx_pwr_env *single_tpe;
        enum wmi_reg_6ghz_client_type client_type;