--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -834,7 +834,7 @@ static int mtk_init_fq_dma(struct mtk_et
+@@ -845,7 +845,7 @@ static int mtk_init_fq_dma(struct mtk_et
eth->scratch_ring = dma_alloc_coherent(eth->dma_dev,
cnt * sizeof(struct mtk_tx_dma),
ð->phy_scratch_ring,
if (unlikely(!eth->scratch_ring))
return -ENOMEM;
-@@ -1609,7 +1609,7 @@ static int mtk_tx_alloc(struct mtk_eth *
+@@ -1623,7 +1623,7 @@ static int mtk_tx_alloc(struct mtk_eth *
goto no_tx_mem;
ring->dma = dma_alloc_coherent(eth->dma_dev, MTK_DMA_SIZE * sz,
if (!ring->dma)
goto no_tx_mem;
-@@ -1627,8 +1627,7 @@ static int mtk_tx_alloc(struct mtk_eth *
+@@ -1641,8 +1641,7 @@ static int mtk_tx_alloc(struct mtk_eth *
*/
if (!MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
ring->dma_pdma = dma_alloc_coherent(eth->dma_dev, MTK_DMA_SIZE * sz,
if (!ring->dma_pdma)
goto no_tx_mem;
-@@ -1740,7 +1739,7 @@ static int mtk_rx_alloc(struct mtk_eth *
+@@ -1757,7 +1756,7 @@ static int mtk_rx_alloc(struct mtk_eth *
ring->dma = dma_alloc_coherent(eth->dma_dev,
rx_dma_size * sizeof(*ring->dma),