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>
This commit is contained in:
committed by
Linus Torvalds
parent
6afd142fd0
commit
284901a90a
@ -1539,8 +1539,8 @@ mpt_mapresources(MPT_ADAPTER *ioc)
|
||||
dinitprintk(ioc, printk(MYIOC_s_INFO_FMT
|
||||
": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n",
|
||||
ioc->name));
|
||||
} else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)
|
||||
&& !pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {
|
||||
} else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))
|
||||
&& !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {
|
||||
dinitprintk(ioc, printk(MYIOC_s_INFO_FMT
|
||||
": 32 BIT PCI BUS DMA ADDRESSING SUPPORTED\n",
|
||||
ioc->name));
|
||||
|
@ -187,7 +187,7 @@ int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len)
|
||||
mutex_lock(&mem_lock);
|
||||
if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_BIT_MASK(64))) {
|
||||
dma_64 = 1;
|
||||
if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
|
||||
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
|
||||
mutex_unlock(&mem_lock);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
@ -334,7 +334,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
|
||||
return rc;
|
||||
}
|
||||
|
||||
if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
|
||||
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
|
||||
printk(KERN_WARNING "i2o: no suitable DMA found for %s\n",
|
||||
pci_name(pdev));
|
||||
rc = -ENODEV;
|
||||
|
Reference in New Issue
Block a user