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

Commit ae9f608f authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

au1000_eth: switch to dma_alloc_attrs 



Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d64bfe9f

drivers/net/ethernet/amd/au1000_eth.c

+10 −8
Original line number Diff line number Diff line
@@ -1180,9 +1180,10 @@ static int au1000_probe(struct platform_device *pdev) 
	/* Allocate the data buffers

	 * Snooping works fine with eth on all au1xxx

	 */

	aup->vaddr = (u32)dma_alloc_noncoherent(NULL, MAX_BUF_SIZE *

	aup->vaddr = (u32)dma_alloc_attrs(NULL, MAX_BUF_SIZE *

					  (NUM_TX_BUFFS + NUM_RX_BUFFS),

						&aup->dma_addr,	0);

					  &aup->dma_addr, 0,

					  DMA_ATTR_NON_CONSISTENT);

	if (!aup->vaddr) {

		dev_err(&pdev->dev, "failed to allocate data buffers\n");

		err = -ENOMEM;
@@ -1361,8 +1362,9 @@ static int au1000_probe(struct platform_device *pdev) 
err_remap2:

	iounmap(aup->mac);

err_remap1:

	dma_free_noncoherent(NULL, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),

			     (void *)aup->vaddr, aup->dma_addr);

	dma_free_attrs(NULL, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),

			(void *)aup->vaddr, aup->dma_addr,

			DMA_ATTR_NON_CONSISTENT);

err_vaddr:

	free_netdev(dev);

err_alloc:
@@ -1394,9 +1396,9 @@ static int au1000_remove(struct platform_device *pdev) 
		if (aup->tx_db_inuse[i])

			au1000_ReleaseDB(aup, aup->tx_db_inuse[i]);



	dma_free_noncoherent(NULL, MAX_BUF_SIZE *

			(NUM_TX_BUFFS + NUM_RX_BUFFS),

			(void *)aup->vaddr, aup->dma_addr);

	dma_free_attrs(NULL, MAX_BUF_SIZE * (NUM_TX_BUFFS + NUM_RX_BUFFS),

			(void *)aup->vaddr, aup->dma_addr,

			DMA_ATTR_NON_CONSISTENT);



	iounmap(aup->macdma);

	iounmap(aup->mac);