Commit 3c69aec4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller

au1000_eth: pass struct device to DMA API functions

The DMA API generally relies on a struct device to work properly, and
only barely works without one for legacy reasons.  Pass the easily
available struct device from the platform_device to remedy this.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e222822f
...@@ -1167,7 +1167,7 @@ static int au1000_probe(struct platform_device *pdev) ...@@ -1167,7 +1167,7 @@ static int au1000_probe(struct platform_device *pdev)
/* Allocate the data buffers /* Allocate the data buffers
* Snooping works fine with eth on all au1xxx * Snooping works fine with eth on all au1xxx
*/ */
aup->vaddr = (u32)dma_alloc_attrs(NULL, MAX_BUF_SIZE * aup->vaddr = (u32)dma_alloc_attrs(&pdev->dev, MAX_BUF_SIZE *
(NUM_TX_BUFFS + NUM_RX_BUFFS), (NUM_TX_BUFFS + NUM_RX_BUFFS),
&aup->dma_addr, 0, &aup->dma_addr, 0,
DMA_ATTR_NON_CONSISTENT); DMA_ATTR_NON_CONSISTENT);
...@@ -1349,7 +1349,7 @@ static int au1000_probe(struct platform_device *pdev) ...@@ -1349,7 +1349,7 @@ static int au1000_probe(struct platform_device *pdev)
err_remap2: err_remap2:
iounmap(aup->mac); iounmap(aup->mac);
err_remap1: err_remap1:
dma_free_attrs(NULL, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS), dma_free_attrs(&pdev->dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),
(void *)aup->vaddr, aup->dma_addr, (void *)aup->vaddr, aup->dma_addr,
DMA_ATTR_NON_CONSISTENT); DMA_ATTR_NON_CONSISTENT);
err_vaddr: err_vaddr:
...@@ -1383,7 +1383,7 @@ static int au1000_remove(struct platform_device *pdev) ...@@ -1383,7 +1383,7 @@ static int au1000_remove(struct platform_device *pdev)
if (aup->tx_db_inuse[i]) if (aup->tx_db_inuse[i])
au1000_ReleaseDB(aup, aup->tx_db_inuse[i]); au1000_ReleaseDB(aup, aup->tx_db_inuse[i]);
dma_free_attrs(NULL, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS), dma_free_attrs(&pdev->dev, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),
(void *)aup->vaddr, aup->dma_addr, (void *)aup->vaddr, aup->dma_addr,
DMA_ATTR_NON_CONSISTENT); DMA_ATTR_NON_CONSISTENT);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment