From 9cecd920a5032feb513ff955fcc4fea8bd82d537 Mon Sep 17 00:00:00 2001 From: Kamal Heib Date: Mon, 7 May 2018 12:05:55 +0300 Subject: [PATCH] staging: mt7621-eth: Fix compilation error MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix the following comilation error by making sure that "phy_ring_head" is defined as "dma_addr_t" and change "phy_ring_tail" to match it as both should be "dma_addr_t". error: passing argument 3 of ‘dma_alloc_coherent’ from incompatible pointer type Signed-off-by: Kamal Heib Reviewed-by: NeilBrown Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mt7621-eth/mtk_eth_soc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/mt7621-eth/mtk_eth_soc.c b/drivers/staging/mt7621-eth/mtk_eth_soc.c index cbc7339843a5..c44a2f8a841c 100644 --- a/drivers/staging/mt7621-eth/mtk_eth_soc.c +++ b/drivers/staging/mt7621-eth/mtk_eth_soc.c @@ -768,9 +768,8 @@ err_dma: /* the qdma core needs scratch memory to be setup */ static int mtk_init_fq_dma(struct mtk_eth *eth) { - unsigned int phy_ring_head, phy_ring_tail; + dma_addr_t dma_addr, phy_ring_head, phy_ring_tail; int cnt = eth->soc->dma_ring_size; - dma_addr_t dma_addr; int i; eth->scratch_ring = dma_alloc_coherent(eth->dev, -- 2.20.1