[PATCH] wifi: mt76: simplify power calculation for mt7603 and mt7615
From: Shiji Yang
Date: Thu Nov 19 2026 - 23:38:12 EST
Use the mt76_get_power_bound() helper to simplify the code.
Signed-off-by: Shiji Yang <yangshiji66@xxxxxxxxxxx>
---
drivers/net/wireless/mediatek/mt76/mt7603/mcu.c | 6 ++----
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 5 ++---
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
index e432cce97640..e921b4956aad 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
@@ -402,8 +402,8 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev)
.tx_streams = n_chains,
.rx_streams = n_chains,
};
- s8 tx_power = hw->conf.power_level * 2;
int i, ret;
+ s8 tx_power;
if (dev->mphy.chandef.width == NL80211_CHAN_WIDTH_40) {
req.bw = MT_BW_40;
@@ -413,9 +413,7 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev)
req.center_chan -= 2;
}
- tx_power = mt76_get_sar_power(&dev->mphy, chandef->chan, tx_power);
- if (dev->mphy.antenna_mask == 3)
- tx_power -= 6;
+ tx_power = mt76_get_power_bound(&dev->mphy, hw->conf.power_level);
tx_power = min(tx_power, dev->tx_power_limit);
dev->mphy.txpower_cur = tx_power;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index ff57ede87f71..57d7ec8fa49a 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -2011,8 +2011,8 @@ static void mt7615_mcu_set_txpower_sku(struct mt7615_phy *phy, u8 *sku)
struct mt76_power_limits limits;
s8 *limits_array = (s8 *)&limits;
int n_chains = hweight8(mphy->antenna_mask);
- int tx_power = hw->conf.power_level * 2;
int i;
+ s8 tx_power;
static const u8 sku_mapping[] = {
#define SKU_FIELD(_type, _field) \
[MT_SKU_##_type] = offsetof(struct mt76_power_limits, _field)
@@ -2068,8 +2068,7 @@ static void mt7615_mcu_set_txpower_sku(struct mt7615_phy *phy, u8 *sku)
#undef SKU_FIELD
};
- tx_power = mt76_get_sar_power(mphy, mphy->chandef.chan, tx_power);
- tx_power -= mt76_tx_power_path_delta(n_chains);
+ tx_power = mt76_get_power_bound(mphy, hw->conf.power_level);
tx_power = mt76_get_rate_power_limits(mphy, mphy->chandef.chan,
&limits, tx_power);
mphy->txpower_cur = tx_power;
--
2.53.0