aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/myri10ge/myri10ge.c
diff options
context:
space:
mode:
authorYang Hongyang <yanghy@cn.fujitsu.com>2009-04-06 22:01:13 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:10 -0400
commit6a35528a8346f6e6fd32ed7e51f04d1fa4ca2c01 (patch)
tree9caaf8645b573687bbcf3a16b5aa7dd233fed46e /drivers/net/myri10ge/myri10ge.c
parent8a59f5d2526593c6bc1a0754c3a16ccc9ed41ce3 (diff)
dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)
Replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64) 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/myri10ge.c')
-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 aea9fdaa3cd5..27655466dbeb 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -3792,7 +3792,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3792 3792
3793 pci_set_master(pdev); 3793 pci_set_master(pdev);
3794 dac_enabled = 1; 3794 dac_enabled = 1;
3795 status = pci_set_dma_mask(pdev, DMA_64BIT_MASK); 3795 status = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
3796 if (status != 0) { 3796 if (status != 0) {
3797 dac_enabled = 0; 3797 dac_enabled = 0;
3798 dev_err(&pdev->dev, 3798 dev_err(&pdev->dev,
@@ -3804,7 +3804,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3804 dev_err(&pdev->dev, "Error %d setting DMA mask\n", status); 3804 dev_err(&pdev->dev, "Error %d setting DMA mask\n", status);
3805 goto abort_with_enabled; 3805 goto abort_with_enabled;
3806 } 3806 }
3807 (void)pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); 3807 (void)pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
3808 mgp->cmd = dma_alloc_coherent(&pdev->dev, sizeof(*mgp->cmd), 3808 mgp->cmd = dma_alloc_coherent(&pdev->dev, sizeof(*mgp->cmd),
3809 &mgp->cmd_bus, GFP_KERNEL); 3809 &mgp->cmd_bus, GFP_KERNEL);
3810 if (mgp->cmd == NULL) 3810 if (mgp->cmd == NULL)