Commit b7c56875 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Kalle Valo
Browse files

mt76: Fix queue ID variable types after mcu queue split 

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: e637763b ("mt76: move mcu queues to mt76_dev q_mcu array")
Link: https://github.com/ClangBuiltLinux/linux/issues/1229


Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Acked-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201229211548.1348077-1-natechancellor@gmail.com
parent 6279d812

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ mt7615_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, 
			int cmd, int *seq)

{

	struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);

	enum mt76_txq_id qid;

	enum mt76_mcuq_id qid;



	mt7615_mcu_fill_msg(dev, skb, cmd, seq);

	if (test_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state))

drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

+5 −5
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, 
	struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);

	struct mt7915_mcu_txd *mcu_txd;

	u8 seq, pkt_fmt, qidx;

	enum mt76_txq_id txq;

	enum mt76_mcuq_id qid;

	__le32 *txd;

	u32 val;
@@ -268,18 +268,18 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, 
		seq = ++dev->mt76.mcu.msg_seq & 0xf;



	if (cmd == -MCU_CMD_FW_SCATTER) {

		txq = MT_MCUQ_FWDL;

		qid = MT_MCUQ_FWDL;

		goto exit;

	}



	mcu_txd = (struct mt7915_mcu_txd *)skb_push(skb, sizeof(*mcu_txd));



	if (test_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state)) {

		txq = MT_MCUQ_WA;

		qid = MT_MCUQ_WA;

		qidx = MT_TX_MCU_PORT_RX_Q0;

		pkt_fmt = MT_TX_TYPE_CMD;

	} else {

		txq = MT_MCUQ_WM;

		qid = MT_MCUQ_WM;

		qidx = MT_TX_MCU_PORT_RX_Q0;

		pkt_fmt = MT_TX_TYPE_CMD;

	}
@@ -326,7 +326,7 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, 
	if (wait_seq)

		*wait_seq = seq;



	return mt76_tx_queue_skb_raw(dev, mdev->q_mcu[txq], skb, 0);

	return mt76_tx_queue_skb_raw(dev, mdev->q_mcu[qid], skb, 0);

}



static void