Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e800a333 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

mt76x0: rename trace symbols 



Rename trace symbols that conflict with mt7601u and remove some
definitions that are not used.

Patch fixes build errors like this:
ld: drivers/net/wireless/mediatek/mt76/mt76x0/trace.o:(__tracepoints+0x0): multiple definition of `__tracepoint_set_shared_key'; drivers/net/wireless/mediatek/mt7601u/trace.o:(__tracepoints+0x0): first defined here

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Fixes: 7b485902 ("mt76x0: core files")
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 909da6e4

drivers/net/wireless/mediatek/mt76/mt76x0/dma.c

+4 −4
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void mt76x0_rx_process_seg(struct mt76x0_dev *dev, u8 *data, 
	if (unlikely(FIELD_GET(MT_RXD_INFO_TYPE, fce_info)))

		dev_err_once(dev->mt76.dev, "Error: RX path seen a non-pkt urb\n");



	trace_mt_rx(&dev->mt76, rxwi, fce_info);

	trace_mt76x0_rx(&dev->mt76, rxwi, fce_info);



	skb = mt76x0_rx_skb_from_seg(dev, rxwi, data, seg_len, truesize, p);

	if (!skb)
@@ -155,7 +155,7 @@ mt76x0_rx_process_entry(struct mt76x0_dev *dev, struct mt76x0_dma_buf_rx *e) 
	}



	if (cnt > 1)

		trace_mt_rx_dma_aggr(&dev->mt76, cnt, !!new_p);

		trace_mt76x0_rx_dma_aggr(&dev->mt76, cnt, !!new_p);



	if (new_p) {

		/* we have one extra ref from the allocator */
@@ -235,7 +235,7 @@ static void mt76x0_complete_tx(struct urb *urb) 
		goto out;



	skb = q->e[q->start].skb;

	trace_mt_tx_dma_done(&dev->mt76, skb);

	trace_mt76x0_tx_dma_done(&dev->mt76, skb);



	__skb_queue_tail(&dev->tx_skb_done, skb);

	tasklet_schedule(&dev->tx_tasklet);
@@ -384,7 +384,7 @@ static int mt76x0_submit_rx_buf(struct mt76x0_dev *dev, 
	usb_fill_bulk_urb(e->urb, usb_dev, pipe, buf, MT_RX_URB_SIZE,

			  mt76x0_complete_rx, dev);



	trace_mt_submit_urb(&dev->mt76, e->urb);

	trace_mt76x0_submit_urb(&dev->mt76, e->urb);

	ret = usb_submit_urb(e->urb, gfp);

	if (ret)

		dev_err(dev->mt76.dev, "Error: submit RX URB failed:%d\n", ret);

drivers/net/wireless/mediatek/mt76/mt76x0/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ int mt76x0_mac_wcid_set_key(struct mt76x0_dev *dev, u8 idx, 
	if (cipher == MT_CIPHER_NONE && key)

		return -EINVAL;



	trace_set_key(&dev->mt76, idx);

	trace_mt76x0_set_key(&dev->mt76, idx);



	mt76_wr_copy(dev, MT_WCID_KEY(idx), key_data, sizeof(key_data));
@@ -646,7 +646,7 @@ int mt76x0_mac_shared_key_setup(struct mt76x0_dev *dev, u8 vif_idx, u8 key_idx, 
	if (cipher == MT_CIPHER_NONE && key)

		return -EINVAL;



	trace_set_shared_key(&dev->mt76, vif_idx, key_idx);

	trace_mt76x0_set_shared_key(&dev->mt76, vif_idx, key_idx);



	mt76_wr_copy(dev, MT_SKEY(vif_idx, key_idx),

			key_data, sizeof(key_data));

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

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static inline void mt76x0_dma_skb_wrap_cmd(struct sk_buff *skb, 
				     FIELD_PREP(MT_TXD_CMD_TYPE, cmd)));

}



static inline void trace_mt_mcu_msg_send_cs(struct mt76_dev *dev,

static inline void trace_mt76x0_mcu_msg_send_cs(struct mt76_dev *dev,

					    struct sk_buff *skb, bool need_resp)

{

	u32 i, csum = 0;
@@ -56,7 +56,7 @@ static inline void trace_mt_mcu_msg_send_cs(struct mt76_dev *dev, 
	for (i = 0; i < skb->len / 4; i++)

		csum ^= get_unaligned_le32(skb->data + i * 4);



	trace_mt_mcu_msg_send(dev, skb, csum, need_resp);

	trace_mt76x0_mcu_msg_send(dev, skb, csum, need_resp);

}



static struct sk_buff *
@@ -168,8 +168,8 @@ __mt76x0_mcu_msg_send(struct mt76x0_dev *dev, struct sk_buff *skb, 
	if (dev->mcu.resp_cmpl.done)

		dev_err(dev->mt76.dev, "Error: MCU response pre-completed!\n");



	trace_mt_mcu_msg_send_cs(&dev->mt76, skb, wait_resp);

	trace_mt_submit_urb_sync(&dev->mt76, cmd_pipe, skb->len);

	trace_mt76x0_mcu_msg_send_cs(&dev->mt76, skb, wait_resp);

	trace_mt76x0_submit_urb_sync(&dev->mt76, cmd_pipe, skb->len);



	ret = usb_bulk_msg(usb_dev, cmd_pipe, skb->data, skb->len, &sent, 500);

	if (ret) {

drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h

+0 −6
Original line number Diff line number Diff line
@@ -124,12 +124,6 @@ struct mt76x0_eeprom_params; 


#define MT_VEND_ADDR(type, n)	(MT_VEND_TYPE_##type | (n))



enum mt_temp_mode {

	MT_TEMP_MODE_NORMAL,

	MT_TEMP_MODE_HIGH,

	MT_TEMP_MODE_LOW,

};



enum mt_bw {

	MT_BW_20,

	MT_BW_40,

drivers/net/wireless/mediatek/mt76/mt76x0/phy.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ mt76x0_rf_csr_wr(struct mt76x0_dev *dev, u32 offset, u8 value) 
		   FIELD_PREP(MT_RF_CSR_CFG_REG_ID, reg) |

		   MT_RF_CSR_CFG_WR |

		   MT_RF_CSR_CFG_KICK);

	trace_rf_write(&dev->mt76, bank, offset, value);

	trace_mt76x0_rf_write(&dev->mt76, bank, offset, value);

out:

	mutex_unlock(&dev->reg_atomic_mutex);
@@ -96,7 +96,7 @@ mt76x0_rf_csr_rr(struct mt76x0_dev *dev, u32 offset) 
	if (FIELD_GET(MT_RF_CSR_CFG_REG_ID, val) == reg &&

	    FIELD_GET(MT_RF_CSR_CFG_REG_BANK, val) == bank) {

		ret = FIELD_GET(MT_RF_CSR_CFG_DATA, val);

		trace_rf_read(&dev->mt76, bank, offset, ret);

		trace_mt76x0_rf_read(&dev->mt76, bank, offset, ret);

	}

out:

	mutex_unlock(&dev->reg_atomic_mutex);