diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:11 -0400 |
commit | 284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch) | |
tree | 06c1b5a0f83c90cfb662f756e7781977ce739ce8 /drivers/net/atlx | |
parent | 6afd142fd0dfba497246d0fab236c20a7b4bf778 (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/atlx')
-rw-r--r-- | drivers/net/atlx/atl1.c | 2 | ||||
-rw-r--r-- | drivers/net/atlx/atl2.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 43fc1b2ca3cd..0ab22540bf59 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -2929,7 +2929,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev, | |||
2929 | * various kernel subsystems to support the mechanics required by a | 2929 | * various kernel subsystems to support the mechanics required by a |
2930 | * fixed-high-32-bit system. | 2930 | * fixed-high-32-bit system. |
2931 | */ | 2931 | */ |
2932 | err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 2932 | err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); |
2933 | if (err) { | 2933 | if (err) { |
2934 | dev_err(&pdev->dev, "no usable DMA configuration\n"); | 2934 | dev_err(&pdev->dev, "no usable DMA configuration\n"); |
2935 | goto err_dma; | 2935 | goto err_dma; |
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index 9fe06c3f4097..c734b1983ec1 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c | |||
@@ -1358,8 +1358,8 @@ static int __devinit atl2_probe(struct pci_dev *pdev, | |||
1358 | * until the kernel has the proper infrastructure to support 64-bit DMA | 1358 | * until the kernel has the proper infrastructure to support 64-bit DMA |
1359 | * on these devices. | 1359 | * on these devices. |
1360 | */ | 1360 | */ |
1361 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) && | 1361 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) && |
1362 | pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) { | 1362 | pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) { |
1363 | printk(KERN_ERR "atl2: No usable DMA configuration, aborting\n"); | 1363 | printk(KERN_ERR "atl2: No usable DMA configuration, aborting\n"); |
1364 | goto err_dma; | 1364 | goto err_dma; |
1365 | } | 1365 | } |