| Message ID | 20200523041923.3332257-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | mt76: mt7915: Use proper enum type in __mt7915_mcu_msg_send | expand |
On Fri, 2020-05-22 at 21:19 -0700, Nathan Chancellor wrote: > Clang warns: > > drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:232:9: warning: implicit > conversion from enumeration type 'enum mt76_txq_id' to different > enumeration type 'enum mt7915_txq_id' [-Wenum-conversion] > txq = MT_TXQ_FWDL; > ~ ^~~~~~~~~~~ > drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:239:9: warning: implicit > conversion from enumeration type 'enum mt76_txq_id' to different > enumeration type 'enum mt7915_txq_id' [-Wenum-conversion] > txq = MT_TXQ_MCU_WA; > ~ ^~~~~~~~~~~~~ > drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:243:9: warning: implicit > conversion from enumeration type 'enum mt76_txq_id' to different > enumeration type 'enum mt7915_txq_id' [-Wenum-conversion] > txq = MT_TXQ_MCU; > ~ ^~~~~~~~~~ > drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:287:36: warning: > implicit conversion from enumeration type 'enum mt7915_txq_id' to > different enumeration type 'enum mt76_txq_id' [-Wenum-conversion] > return mt76_tx_queue_skb_raw(dev, txq, skb, 0); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~ > > txq should be a "enum mt76_txq_id" as values of that type are the only > ones assigned to it and that is the type that mt76_tx_queue_skb_raw > expects. > > Fixes: e57b7901469f ("mt76: add mac80211 driver for MT7915 PCIe-based chipsets") > Link: https://github.com/ClangBuiltLinux/linux/issues/1035 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > --- > drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > index f00ad2b66761..916f664e964e 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c > @@ -220,7 +220,7 @@ static int __mt7915_mcu_msg_send(struct mt7915_dev *dev, struct sk_buff *skb, > { > struct mt7915_mcu_txd *mcu_txd; > u8 seq, pkt_fmt, qidx; > - enum mt7915_txq_id txq; > + enum mt76_txq_id txq; > __le32 *txd; > u32 val; > > > base-commit: c11d28ab4a691736e30b49813fb801847bd44e83 Thanks. I have posted the fix here: https://patchwork.kernel.org/patch/11553415/ This is already in Felix's tree.
diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c index f00ad2b66761..916f664e964e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c @@ -220,7 +220,7 @@ static int __mt7915_mcu_msg_send(struct mt7915_dev *dev, struct sk_buff *skb, { struct mt7915_mcu_txd *mcu_txd; u8 seq, pkt_fmt, qidx; - enum mt7915_txq_id txq; + enum mt76_txq_id txq; __le32 *txd; u32 val;
Clang warns: drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:232:9: warning: implicit conversion from enumeration type 'enum mt76_txq_id' to different enumeration type 'enum mt7915_txq_id' [-Wenum-conversion] txq = MT_TXQ_FWDL; ~ ^~~~~~~~~~~ drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:239:9: warning: implicit conversion from enumeration type 'enum mt76_txq_id' to different enumeration type 'enum mt7915_txq_id' [-Wenum-conversion] txq = MT_TXQ_MCU_WA; ~ ^~~~~~~~~~~~~ drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:243:9: warning: implicit conversion from enumeration type 'enum mt76_txq_id' to different enumeration type 'enum mt7915_txq_id' [-Wenum-conversion] txq = MT_TXQ_MCU; ~ ^~~~~~~~~~ drivers/net/wireless/mediatek/mt76/mt7915/mcu.c:287:36: warning: implicit conversion from enumeration type 'enum mt7915_txq_id' to different enumeration type 'enum mt76_txq_id' [-Wenum-conversion] return mt76_tx_queue_skb_raw(dev, txq, skb, 0); ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~ txq should be a "enum mt76_txq_id" as values of that type are the only ones assigned to it and that is the type that mt76_tx_queue_skb_raw expects. Fixes: e57b7901469f ("mt76: add mac80211 driver for MT7915 PCIe-based chipsets") Link: https://github.com/ClangBuiltLinux/linux/issues/1035 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: c11d28ab4a691736e30b49813fb801847bd44e83