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

Commit 6c21da20 authored by Sean Wang's avatar Sean Wang Committed by David S. Miller
Browse files

net-next: mediatek: improve more with using dma_zalloc_coherent 



Improve more in the existing code by reusing dma_zalloc_coherent instead
of dma_alloc_coherent with __GFP_ZERO or superfluous zeroing buffer.

Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1753390

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+7 −9
Original line number Diff line number Diff line
@@ -605,10 +605,10 @@ static int mtk_init_fq_dma(struct mtk_eth *eth) 
	dma_addr_t dma_addr;

	int i;



	eth->scratch_ring = dma_alloc_coherent(eth->dev,

	eth->scratch_ring = dma_zalloc_coherent(eth->dev,

						cnt * sizeof(struct mtk_tx_dma),

						&eth->phy_scratch_ring,

					       GFP_ATOMIC | __GFP_ZERO);

						GFP_ATOMIC);

	if (unlikely(!eth->scratch_ring))

		return -ENOMEM;
@@ -623,7 +623,6 @@ static int mtk_init_fq_dma(struct mtk_eth *eth) 
	if (unlikely(dma_mapping_error(eth->dev, dma_addr)))

		return -ENOMEM;



	memset(eth->scratch_ring, 0x0, sizeof(struct mtk_tx_dma) * cnt);

	phy_ring_tail = eth->phy_scratch_ring +

			(sizeof(struct mtk_tx_dma) * (cnt - 1));
@@ -1318,10 +1317,9 @@ static int mtk_rx_alloc(struct mtk_eth *eth, int ring_no, int rx_flag) 
			return -ENOMEM;

	}



	ring->dma = dma_alloc_coherent(eth->dev,

	ring->dma = dma_zalloc_coherent(eth->dev,

					rx_dma_size * sizeof(*ring->dma),

				       &ring->phys,

				       GFP_ATOMIC | __GFP_ZERO);

					&ring->phys, GFP_ATOMIC);

	if (!ring->dma)

		return -ENOMEM;