aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/myri10ge
diff options
context:
space:
mode:
authorYang Hongyang <yanghy@cn.fujitsu.com>2009-04-06 22:01:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:11 -0400
commit284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch)
tree06c1b5a0f83c90cfb662f756e7781977ce739ce8 /drivers/net/myri10ge
parent6afd142fd0dfba497246d0fab236c20a7b4bf778 (diff)
dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/myri10ge')
-rw-r--r--drivers/net/myri10ge/myri10ge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 27655466dbeb..9eed126a82f0 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1130,7 +1130,7 @@ myri10ge_submit_8rx(struct mcp_kreq_ether_recv __iomem * dst,
1130 __be32 low; 1130 __be32 low;
1131 1131
1132 low = src->addr_low; 1132 low = src->addr_low;
1133 src->addr_low = htonl(DMA_32BIT_MASK); 1133 src->addr_low = htonl(DMA_BIT_MASK(32));
1134 myri10ge_pio_copy(dst, src, 4 * sizeof(*src)); 1134 myri10ge_pio_copy(dst, src, 4 * sizeof(*src));
1135 mb(); 1135 mb();
1136 myri10ge_pio_copy(dst + 4, src + 4, 4 * sizeof(*src)); 1136 myri10ge_pio_copy(dst + 4, src + 4, 4 * sizeof(*src));
@@ -3798,7 +3798,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3798 dev_err(&pdev->dev, 3798 dev_err(&pdev->dev,
3799 "64-bit pci address mask was refused, " 3799 "64-bit pci address mask was refused, "
3800 "trying 32-bit\n"); 3800 "trying 32-bit\n");
3801 status = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 3801 status = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
3802 } 3802 }
3803 if (status != 0) { 3803 if (status != 0) {
3804 dev_err(&pdev->dev, "Error %d setting DMA mask\n", status); 3804 dev_err(&pdev->dev, "Error %d setting DMA mask\n", status);