Commit f2a00a82 authored by Felix Fietkau's avatar Felix Fietkau Committed by Kalle Valo

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().
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 40b94161
...@@ -135,8 +135,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg) ...@@ -135,8 +135,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg)
out: out:
mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false); mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);
if (dev->mt76.q_tx[MT_TXQ_BEACON].queued > if (dev->mt76.q_tx[MT_TXQ_BEACON].queued > hweight8(dev->beacon_mask))
__sw_hweight8(dev->beacon_mask))
dev->beacon_check++; dev->beacon_check++;
} }
......
...@@ -112,7 +112,7 @@ static void ...@@ -112,7 +112,7 @@ static void
mt7603_phy_init(struct mt7603_dev *dev) mt7603_phy_init(struct mt7603_dev *dev)
{ {
int rx_chains = dev->mt76.antenna_mask; 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, mt76_rmw(dev, MT_WF_RMAC_RMCR,
(MT_WF_RMAC_RMCR_SMPS_MODE | (MT_WF_RMAC_RMCR_SMPS_MODE |
......
...@@ -433,7 +433,7 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev) ...@@ -433,7 +433,7 @@ int mt7603_mcu_set_channel(struct mt7603_dev *dev)
{ {
struct cfg80211_chan_def *chandef = &dev->mt76.chandef; struct cfg80211_chan_def *chandef = &dev->mt76.chandef;
struct ieee80211_hw *hw = mt76_hw(dev); 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 { struct {
u8 control_chan; u8 control_chan;
u8 center_chan; u8 center_chan;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment