On 2021-01-11 09:06, Kalle Valo wrote: > Lorenzo Bianconi <lorenzo@xxxxxxxxxx> writes: > >>> Clang warns in both mt7615 and mt7915: >>> >>> drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:271:9: warning: implicit >>> conversion from enumeration type 'enum mt76_mcuq_id' to different >>> enumeration type 'enum mt76_txq_id' [-Wenum-conversion] >>> txq = MT_MCUQ_FWDL; >>> ~ ^~~~~~~~~~~~ >>> drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:278:9: warning: implicit >>> conversion from enumeration type 'enum mt76_mcuq_id' to different >>> enumeration type 'enum mt76_txq_id' [-Wenum-conversion] >>> txq = MT_MCUQ_WA; >>> ~ ^~~~~~~~~~ >>> drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:282:9: warning: implicit >>> conversion from enumeration type 'enum mt76_mcuq_id' to different >>> enumeration type 'enum mt76_txq_id' [-Wenum-conversion] >>> txq = MT_MCUQ_WM; >>> ~ ^~~~~~~~~~ >>> 3 warnings generated. >>> >>> drivers/net/wireless/mediatek/mt76/mt7615/mcu.c:238:9: warning: implicit >>> conversion from enumeration type 'enum mt76_mcuq_id' to different >>> enumeration type 'enum mt76_txq_id' [-Wenum-conversion] >>> qid = MT_MCUQ_WM; >>> ~ ^~~~~~~~~~ >>> drivers/net/wireless/mediatek/mt76/mt7615/mcu.c:240:9: warning: implicit >>> conversion from enumeration type 'enum mt76_mcuq_id' to different >>> enumeration type 'enum mt76_txq_id' [-Wenum-conversion] >>> qid = MT_MCUQ_FWDL; >>> ~ ^~~~~~~~~~~~ >>> 2 warnings generated. >>> >>> Use the proper type for the queue ID variables to fix these warnings. >>> Additionally, rename the txq variable in mt7915_mcu_send_message to be >>> more neutral like mt7615_mcu_send_message. >>> >>> Fixes: e637763b606b ("mt76: move mcu queues to mt76_dev q_mcu array") >>> Link: https://github.com/ClangBuiltLinux/linux/issues/1229 >>> Signed-off-by: Nathan Chancellor <natechancellor@xxxxxxxxx> >> >> Acked-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx> > > I see that Felix already applied this, but as this is a regression > starting from v5.11-rc1 I think it should be applied to > wireless-drivers. Felix, can you drop this from your tree so that I > could apply it to wireless-drivers? Sure, will do. - Felix