dma-mapping: replace all DMA_31BIT_MASK macro with DMA_BIT_MASK(31)
Replace all DMA_31BIT_MASK macro with DMA_BIT_MASK(31) 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:
parent
284901a90a
commit
929a22a558
|
@ -1206,8 +1206,8 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced)
|
|||
aac->fsa_dev = NULL;
|
||||
quirks = aac_get_driver_ident(index)->quirks;
|
||||
if (quirks & AAC_QUIRK_31BIT) {
|
||||
if (((retval = pci_set_dma_mask(aac->pdev, DMA_31BIT_MASK))) ||
|
||||
((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_31BIT_MASK))))
|
||||
if (((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(31)))) ||
|
||||
((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_BIT_MASK(31)))))
|
||||
goto out;
|
||||
} else {
|
||||
if (((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(32)))) ||
|
||||
|
|
|
@ -1103,8 +1103,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
|
|||
* to driver communication memory to be allocated below 2gig
|
||||
*/
|
||||
if (aac_drivers[index].quirks & AAC_QUIRK_31BIT)
|
||||
if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) ||
|
||||
pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK))
|
||||
if (pci_set_dma_mask(pdev, DMA_BIT_MASK(31)) ||
|
||||
pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(31)))
|
||||
goto out_disable_pdev;
|
||||
|
||||
pci_set_master(pdev);
|
||||
|
|
|
@ -108,7 +108,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
|
|||
case 0x00d8: /* CK8 */
|
||||
case 0x00e8: /* CK8S */
|
||||
if (pci_set_consistent_dma_mask(pdev,
|
||||
DMA_31BIT_MASK) < 0)
|
||||
DMA_BIT_MASK(31)) < 0)
|
||||
ehci_warn(ehci, "can't enable NVidia "
|
||||
"workaround for >2GB RAM\n");
|
||||
break;
|
||||
|
|
|
@ -2186,8 +2186,8 @@ static int __devinit snd_ali_create(struct snd_card *card,
|
|||
if (err < 0)
|
||||
return err;
|
||||
/* check, if we can restrict PCI DMA transfers to 31 bits */
|
||||
if (pci_set_dma_mask(pci, DMA_31BIT_MASK) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_31BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(31)) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(31)) < 0) {
|
||||
snd_printk(KERN_ERR "architecture does not support "
|
||||
"31bit PCI busmaster DMA\n");
|
||||
pci_disable_device(pci);
|
||||
|
|
Loading…
Reference in a new issue