Skip to contentSkip to conversation

mt76: mt7603: use the correct hweight8() function

PATCH In review Felix Fietkau 2 participants 4 messages Mar 11, 2019 – Mar 19, 2019

Subsystems (2)
lore
Share & tools
lore

Felix Fietkau

author maintainer
#0 lore raw

PATCH 1/1 mt76: mt7603: use the correct hweight8() function

__sw_hweight8() is only defined if CONFIG_GENERIC_HWEIGHT is enabled. The function that works on all architectures is hweight8().

---
 drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 3 +--
 drivers/net/wireless/mediatek/mt76/mt7603/init.c   | 2 +-
 drivers/net/wireless/mediatek/mt76/mt7603/mcu.c    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/beacon.c +1 -2
index afcd86f735b4..4dcb465095d1 100644
@@ -135,8 +135,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)
 
 out:
 	mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);
-	if (dev->mt76.q_tx[MT_TXQ_BEACON].queued >
-	    __sw_hweight8(dev->beacon_mask))
+	if (dev->mt76.q_tx[MT_TXQ_BEACON].queued > hweight8(dev->beacon_mask))
 		dev->beacon_check++;
 }
 
drivers/net/wireless/mediatek/mt76/mt7603/init.c +1 -1
index 15cc8f33b34d..d54dda67d036 100644
@@ -112,7 +112,7 @@ static void
 mt7603_phy_init(struct mt7603_dev *dev)
 {
 	int rx_chains = dev->mt76.antenna_mask;
-	int tx_chains = __sw_hweight8(rx_chains) - 1;
+	int tx_chains = hweight8(rx_chains) - 1;
 
 	mt76_rmw(dev, MT_WF_RMAC_RMCR,
 		 (MT_WF_RMAC_RMCR_SMPS_MODE |
drivers/net/wireless/mediatek/mt76/mt7603/mcu.c +1 -1
index 4b0713f1fd5e..d06905ea8cc6 100644
@@ -433,7 +433,7 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev)
 {
 	struct cfg80211_chan_def *chandef = &dev->mt76.chandef;
 	struct ieee80211_hw *hw = mt76_hw(dev);
-	int n_chains = __sw_hweight8(dev->mt76.antenna_mask);
+	int n_chains = hweight8(dev->mt76.antenna_mask);
 	struct {
 		u8 control_chan;
 		u8 center_chan;
Signature · 1 line
2.17.0
#1 lore raw
Quoted 4 lines · Felix Fietkau

__sw_hweight8() is only defined if CONFIG_GENERIC_HWEIGHT is enabled. The function that works on all architectures is hweight8().

This should go to 5.1, right?

Signature · 1 line
Kalle Valo
author maintainer
#2 lore raw
Quoted 8 lines · Kalle Valo
Quoted 4 lines · Felix Fietkau

__sw_hweight8() is only defined if CONFIG_GENERIC_HWEIGHT is enabled. The function that works on all architectures is hweight8().

This should go to 5.1, right?

Yes.

- Felix

#3 lore raw
In reply to Felix Fietkau
Quoted 4 lines · Felix Fietkau

__sw_hweight8() is only defined if CONFIG_GENERIC_HWEIGHT is enabled. The function that works on all architectures is hweight8().

Patch applied to wireless-drivers.git, thanks.

f2a00a821aac mt76: mt7603: use the correct hweight8() function

Signature · 3 lines
https://patchwork.kernel.org/patch/10847433/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches