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

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>

Christoph Hellwig 7f683b92 ae9f608f

+9 -12
+2 -4
drivers/net/ethernet/i825xx/lasi_82596.c
··· 96 96 97 97 #define OPT_SWAP_PORT 0x0001 /* Need to wordswp on the MPU port */ 98 98 99 - #define DMA_ALLOC dma_alloc_noncoherent 100 - #define DMA_FREE dma_free_noncoherent 101 99 #define DMA_WBACK(ndev, addr, len) \ 102 100 do { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_TO_DEVICE); } while (0) 103 101 ··· 198 200 struct i596_private *lp = netdev_priv(dev); 199 201 200 202 unregister_netdev (dev); 201 - DMA_FREE(&pdev->dev, sizeof(struct i596_private), 202 - (void *)lp->dma, lp->dma_addr); 203 + dma_free_attrs(&pdev->dev, sizeof(struct i596_private), lp->dma, 204 + lp->dma_addr, DMA_ATTR_NON_CONSISTENT); 203 205 free_netdev (dev); 204 206 return 0; 205 207 }
+5 -4
drivers/net/ethernet/i825xx/lib82596.c
··· 1063 1063 if (!dev->base_addr || !dev->irq) 1064 1064 return -ENODEV; 1065 1065 1066 - dma = (struct i596_dma *) DMA_ALLOC(dev->dev.parent, 1067 - sizeof(struct i596_dma), &lp->dma_addr, GFP_KERNEL); 1066 + dma = dma_alloc_attrs(dev->dev.parent, sizeof(struct i596_dma), 1067 + &lp->dma_addr, GFP_KERNEL, 1068 + DMA_ATTR_NON_CONSISTENT); 1068 1069 if (!dma) { 1069 1070 printk(KERN_ERR "%s: Couldn't get shared memory\n", __FILE__); 1070 1071 return -ENOMEM; ··· 1086 1085 1087 1086 i = register_netdev(dev); 1088 1087 if (i) { 1089 - DMA_FREE(dev->dev.parent, sizeof(struct i596_dma), 1090 - (void *)dma, lp->dma_addr); 1088 + dma_free_attrs(dev->dev.parent, sizeof(struct i596_dma), 1089 + dma, lp->dma_addr, DMA_ATTR_NON_CONSISTENT); 1091 1090 return i; 1092 1091 } 1093 1092
+2 -4
drivers/net/ethernet/i825xx/sni_82596.c
··· 23 23 24 24 static const char sni_82596_string[] = "snirm_82596"; 25 25 26 - #define DMA_ALLOC dma_alloc_coherent 27 - #define DMA_FREE dma_free_coherent 28 26 #define DMA_WBACK(priv, addr, len) do { } while (0) 29 27 #define DMA_INV(priv, addr, len) do { } while (0) 30 28 #define DMA_WBACK_INV(priv, addr, len) do { } while (0) ··· 150 152 struct i596_private *lp = netdev_priv(dev); 151 153 152 154 unregister_netdev(dev); 153 - DMA_FREE(dev->dev.parent, sizeof(struct i596_private), 154 - lp->dma, lp->dma_addr); 155 + dma_free_attrs(dev->dev.parent, sizeof(struct i596_private), lp->dma, 156 + lp->dma_addr, DMA_ATTR_NON_CONSISTENT); 155 157 iounmap(lp->ca); 156 158 iounmap(lp->mpu_port); 157 159 free_netdev (dev);