Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sgiseeq: switch to dma_alloc_attrs

Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: David S. Miller <davem@davemloft.net>

+4 -4
+4 -4
drivers/net/ethernet/seeq/sgiseeq.c
··· 737 737 sp = netdev_priv(dev); 738 738 739 739 /* Make private data page aligned */ 740 - sr = dma_alloc_noncoherent(&pdev->dev, sizeof(*sp->srings), 741 - &sp->srings_dma, GFP_KERNEL); 740 + sr = dma_alloc_attrs(&pdev->dev, sizeof(*sp->srings), &sp->srings_dma, 741 + GFP_KERNEL, DMA_ATTR_NON_CONSISTENT); 742 742 if (!sr) { 743 743 printk(KERN_ERR "Sgiseeq: Page alloc failed, aborting.\n"); 744 744 err = -ENOMEM; ··· 813 813 struct sgiseeq_private *sp = netdev_priv(dev); 814 814 815 815 unregister_netdev(dev); 816 - dma_free_noncoherent(&pdev->dev, sizeof(*sp->srings), sp->srings, 817 - sp->srings_dma); 816 + dma_free_attrs(&pdev->dev, sizeof(*sp->srings), sp->srings, 817 + sp->srings_dma, DMA_ATTR_NON_CONSISTENT); 818 818 free_netdev(dev); 819 819 820 820 return 0;