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
@@ -909,8 +909,8 @@ snd_ad1889_create(struct snd_card *card,
|
||||
return err;
|
||||
|
||||
/* check PCI availability (32bit DMA) */
|
||||
if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
|
||||
printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n");
|
||||
pci_disable_device(pci);
|
||||
return -ENXIO;
|
||||
|
@@ -151,8 +151,8 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
|
||||
// check PCI availability (DMA).
|
||||
if ((err = pci_enable_device(pci)) < 0)
|
||||
return err;
|
||||
if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
|
||||
printk(KERN_ERR "error to set DMA mask\n");
|
||||
pci_disable_device(pci);
|
||||
return -ENXIO;
|
||||
|
@@ -279,8 +279,8 @@ static int __devinit snd_aw2_create(struct snd_card *card,
|
||||
pci_set_master(pci);
|
||||
|
||||
/* check PCI availability (32bit DMA) */
|
||||
if ((pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) ||
|
||||
(pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0)) {
|
||||
if ((pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) ||
|
||||
(pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0)) {
|
||||
printk(KERN_ERR "aw2: Impossible to set 32bit mask DMA\n");
|
||||
pci_disable_device(pci);
|
||||
return -ENXIO;
|
||||
|
@@ -1589,8 +1589,8 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card,
|
||||
err = pci_enable_device(pci);
|
||||
if (err < 0)
|
||||
return err;
|
||||
if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
|
||||
printk(KERN_ERR "error to set 32bit mask DMA\n");
|
||||
pci_disable_device(pci);
|
||||
return -ENXIO;
|
||||
|
@@ -285,8 +285,8 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,
|
||||
if ((err = pci_enable_device(pci)) < 0)
|
||||
return err;
|
||||
|
||||
if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
|
||||
pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
|
||||
printk(KERN_WARNING "unable to get 32bit dma\n");
|
||||
err = -ENXIO;
|
||||
goto pcifail;
|
||||
|
@@ -1291,7 +1291,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
|
||||
pci_set_master(pci);
|
||||
|
||||
/* check if we can restrict PCI DMA transfers to 32 bits */
|
||||
if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
|
||||
snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n");
|
||||
pci_disable_device(pci);
|
||||
return -ENXIO;
|
||||
|
@@ -1449,7 +1449,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci,
|
||||
pci_set_master(pci);
|
||||
|
||||
/* check if we can restrict PCI DMA transfers to 32 bits */
|
||||
if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) {
|
||||
if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
|
||||
snd_printk(KERN_ERR "architecture does not support "
|
||||
"32bit PCI busmaster DMA\n");
|
||||
pci_disable_device(pci);
|
||||
|
Reference in New Issue
Block a user