wifi: rtw89: reference quota mode when setting Tx power

Reference the current quota mode to avoid misleading warnings.
This patch is required after supporting DBCC quota mode.

Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240209065229.34515-11-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/mac.c b/drivers/net/wireless/realtek/rtw89/mac.c
index 9e9a05cc49de9d9c7cd3380cad13d270bf6961dd..296576a634e7956965c824a59eb33df5d22dd4d9 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.c
+++ b/drivers/net/wireless/realtek/rtw89/mac.c
@@ -5221,8 +5221,7 @@ bool rtw89_mac_get_txpwr_cr_ax(struct rtw89_dev *rtwdev,
                               enum rtw89_phy_idx phy_idx,
                               u32 reg_base, u32 *cr)
 {
-       const struct rtw89_dle_mem *dle_mem = rtwdev->chip->dle_mem;
-       enum rtw89_qta_mode mode = dle_mem->mode;
+       enum rtw89_qta_mode mode = rtwdev->mac.qta_mode;
        u32 addr = rtw89_mac_reg_by_idx(rtwdev, reg_base, phy_idx);
 
        if (addr < R_AX_PWR_RATE_CTRL || addr > CMAC1_END_ADDR_AX) {

diff --git a/drivers/net/wireless/realtek/rtw89/mac_be.c b/drivers/net/wireless/realtek/rtw89/mac_be.c
index 6447353d35d3561cc01bf17a109769a9cde6a290..320e88229971e7549b7afd8fc2cbaf0743387710 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac_be.c
+++ b/drivers/net/wireless/realtek/rtw89/mac_be.c
@@ -1896,8 +1896,7 @@ static bool rtw89_mac_get_txpwr_cr_be(struct rtw89_dev *rtwdev,
                                      enum rtw89_phy_idx phy_idx,
                                      u32 reg_base, u32 *cr)
 {
-       const struct rtw89_dle_mem *dle_mem = rtwdev->chip->dle_mem;
-       enum rtw89_qta_mode mode = dle_mem->mode;
+       enum rtw89_qta_mode mode = rtwdev->mac.qta_mode;
        int ret;
 
        ret = rtw89_mac_check_mac_en(rtwdev, (enum rtw89_mac_idx)phy_idx,