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/message/i2o | |
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/message/i2o')
-rw-r--r-- | drivers/message/i2o/memory.c | 2 | ||||
-rw-r--r-- | drivers/message/i2o/pci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/message/i2o/memory.c b/drivers/message/i2o/memory.c index 9a08d8e45516..292b41e49fbd 100644 --- a/drivers/message/i2o/memory.c +++ b/drivers/message/i2o/memory.c | |||
@@ -187,7 +187,7 @@ int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len) | |||
187 | mutex_lock(&mem_lock); | 187 | mutex_lock(&mem_lock); |
188 | if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_BIT_MASK(64))) { | 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_BIT_MASK(32))) { |
191 | mutex_unlock(&mem_lock); | 191 | mutex_unlock(&mem_lock); |
192 | return -ENOMEM; | 192 | return -ENOMEM; |
193 | } | 193 | } |
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index ed17ac5af3e0..35ba2ae38b42 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c | |||
@@ -334,7 +334,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, | |||
334 | return rc; | 334 | return rc; |
335 | } | 335 | } |
336 | 336 | ||
337 | if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { | 337 | if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) { |
338 | printk(KERN_WARNING "i2o: no suitable DMA found for %s\n", | 338 | printk(KERN_WARNING "i2o: no suitable DMA found for %s\n", |
339 | pci_name(pdev)); | 339 | pci_name(pdev)); |
340 | rc = -ENODEV; | 340 | rc = -ENODEV; |