[][kernel][common][eth][Fix ETH compilation warnings]
[Description]
Fix ETH compilation warnings.
- unused variable 'mcr' in the mtk_prepare_reset_fe()
- unused variable 'i' in the mtk_start_xmit()
- unused variable 'reg_map' in the mtk_handle_irq_txrx()
- comparison of distinct pointer types lacks a cast in the mtk_tx_map()
[Release-log]
N/A
Change-Id: Ica55dfedfde2403f3ea10af3f73883cee85280da
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9388591
diff --git a/21.02/files/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_reset.c b/21.02/files/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_reset.c
index 938d595..9b4c7f9 100644
--- a/21.02/files/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_reset.c
+++ b/21.02/files/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_reset.c
@@ -861,7 +861,7 @@
void mtk_prepare_reset_fe(struct mtk_eth *eth)
{
- u32 i = 0, val = 0, mcr = 0;
+ u32 i = 0, val = 0;
/* Disable NETSYS Interrupt */
mtk_w32(eth, 0, MTK_FE_INT_ENABLE);
diff --git a/21.02/files/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/21.02/files/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index cd60a14..5a0f9e9 100644
--- a/21.02/files/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/21.02/files/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -2156,7 +2156,8 @@
}
memset(&txd_info, 0, sizeof(struct mtk_tx_dma_desc_info));
- txd_info.size = min(frag_size, eth->soc->txrx.dma_max_len);
+ txd_info.size = min_t(unsigned int, frag_size,
+ eth->soc->txrx.dma_max_len);
txd_info.qid = queue;
txd_info.last = i == skb_shinfo(skb)->nr_frags - 1 &&
!(frag_size - txd_info.size);
@@ -2316,7 +2317,6 @@
struct netdev_queue *txq;
bool gso = false;
int tx_num;
- int i = 0;
int qid = skb_get_queue_mapping(skb);
/* normally we can rely on the stack not calling this more than once,
@@ -3863,8 +3863,8 @@
const struct mtk_reg_map *reg_map = eth->soc->reg_map;
if (tx_ring) {
- if (unlikely(!(mtk_r32(eth, eth->soc->reg_map->pdma.irq_status) &
- mtk_r32(eth, eth->soc->reg_map->pdma.irq_mask) &
+ if (unlikely(!(mtk_r32(eth, reg_map->pdma.irq_status) &
+ mtk_r32(eth, reg_map->pdma.irq_mask) &
MTK_TX_DONE_INT(tx_ring->ring_no))))
return IRQ_NONE;
@@ -3873,8 +3873,8 @@
__napi_schedule(&txrx_napi->napi);
}
} else {
- if (unlikely(!(mtk_r32(eth, eth->soc->reg_map->pdma.irq_status) &
- mtk_r32(eth, eth->soc->reg_map->pdma.irq_mask) &
+ if (unlikely(!(mtk_r32(eth, reg_map->pdma.irq_status) &
+ mtk_r32(eth, reg_map->pdma.irq_mask) &
MTK_RX_DONE_INT(rx_ring->ring_no))))
return IRQ_NONE;