summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/i825xx/lasi_82596.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-06-14 10:33:48 +0200
committerChristoph Hellwig <hch@lst.de>2017-08-29 10:03:45 +0200
commit7f683b920479530150cafbed9dc02eeafb90486b (patch)
tree3c8880c9def0428b0fef825ed33daa6d49d4aaa2 /drivers/net/ethernet/i825xx/lasi_82596.c
parentae9f608f07e7828801430a00f67882fc386b33d5 (diff)
i825xx: switch to switch to dma_alloc_attrs
This way we can always pass DMA_ATTR_NON_CONSISTENT, the SNI mips version will simply ignore the flag. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/i825xx/lasi_82596.c')
-rw-r--r--drivers/net/ethernet/i825xx/lasi_82596.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/i825xx/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c
index d787fdd5db7b..d5b5021aa759 100644
--- a/drivers/net/ethernet/i825xx/lasi_82596.c
+++ b/drivers/net/ethernet/i825xx/lasi_82596.c
@@ -96,8 +96,6 @@
#define OPT_SWAP_PORT 0x0001 /* Need to wordswp on the MPU port */
-#define DMA_ALLOC dma_alloc_noncoherent
-#define DMA_FREE dma_free_noncoherent
#define DMA_WBACK(ndev, addr, len) \
do { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_TO_DEVICE); } while (0)
@@ -200,8 +198,8 @@ static int lan_remove_chip(struct parisc_device *pdev)
struct i596_private *lp = netdev_priv(dev);
unregister_netdev (dev);
- DMA_FREE(&pdev->dev, sizeof(struct i596_private),
- (void *)lp->dma, lp->dma_addr);
+ dma_free_attrs(&pdev->dev, sizeof(struct i596_private), lp->dma,
+ lp->dma_addr, DMA_ATTR_NON_CONSISTENT);
free_netdev (dev);
return 0;
}