diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:10 -0400 |
commit | 6a35528a8346f6e6fd32ed7e51f04d1fa4ca2c01 (patch) | |
tree | 9caaf8645b573687bbcf3a16b5aa7dd233fed46e /drivers/message/i2o | |
parent | 8a59f5d2526593c6bc1a0754c3a16ccc9ed41ce3 (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/message/i2o')
-rw-r--r-- | drivers/message/i2o/memory.c | 4 | ||||
-rw-r--r-- | drivers/message/i2o/pci.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/message/i2o/memory.c b/drivers/message/i2o/memory.c index f5cc95c564e2..9a08d8e45516 100644 --- a/drivers/message/i2o/memory.c +++ b/drivers/message/i2o/memory.c | |||
@@ -185,7 +185,7 @@ int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len) | |||
185 | int dma_64 = 0; | 185 | int dma_64 = 0; |
186 | 186 | ||
187 | mutex_lock(&mem_lock); | 187 | mutex_lock(&mem_lock); |
188 | if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_64BIT_MASK)) { | 188 | if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_BIT_MASK(64))) { |
189 | dma_64 = 1; | 189 | dma_64 = 1; |
190 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { | 190 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { |
191 | mutex_unlock(&mem_lock); | 191 | mutex_unlock(&mem_lock); |
@@ -196,7 +196,7 @@ int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len) | |||
196 | addr->virt = dma_alloc_coherent(dev, len, &addr->phys, GFP_KERNEL); | 196 | addr->virt = dma_alloc_coherent(dev, len, &addr->phys, GFP_KERNEL); |
197 | 197 | ||
198 | if ((sizeof(dma_addr_t) > 4) && dma_64) | 198 | if ((sizeof(dma_addr_t) > 4) && dma_64) |
199 | if (pci_set_dma_mask(pdev, DMA_64BIT_MASK)) | 199 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) |
200 | printk(KERN_WARNING "i2o: unable to set 64-bit DMA"); | 200 | printk(KERN_WARNING "i2o: unable to set 64-bit DMA"); |
201 | mutex_unlock(&mem_lock); | 201 | mutex_unlock(&mem_lock); |
202 | 202 | ||
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index 25d6f2341983..ed17ac5af3e0 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c | |||
@@ -397,7 +397,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, | |||
397 | } | 397 | } |
398 | #ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64 | 398 | #ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64 |
399 | if (sizeof(dma_addr_t) > 4) { | 399 | if (sizeof(dma_addr_t) > 4) { |
400 | if (pci_set_dma_mask(pdev, DMA_64BIT_MASK)) | 400 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) |
401 | printk(KERN_INFO "%s: 64-bit DMA unavailable\n", | 401 | printk(KERN_INFO "%s: 64-bit DMA unavailable\n", |
402 | c->name); | 402 | c->name); |
403 | else { | 403 | else { |