diff options
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/ad1889.c | 4 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0.c | 4 | ||||
-rw-r--r-- | sound/pci/aw2/aw2-alsa.c | 4 | ||||
-rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 4 | ||||
-rw-r--r-- | sound/pci/cs5535audio/cs5535audio.c | 4 | ||||
-rw-r--r-- | sound/pci/mixart/mixart.c | 2 | ||||
-rw-r--r-- | sound/pci/pcxhr/pcxhr.c | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index d1f242bd0ac5..8f5098f92c37 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c | |||
@@ -909,8 +909,8 @@ snd_ad1889_create(struct snd_card *card, | |||
909 | return err; | 909 | return err; |
910 | 910 | ||
911 | /* check PCI availability (32bit DMA) */ | 911 | /* check PCI availability (32bit DMA) */ |
912 | if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 || | 912 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 || |
913 | pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) { | 913 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) { |
914 | printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n"); | 914 | printk(KERN_ERR PFX "error setting 32-bit DMA mask.\n"); |
915 | pci_disable_device(pci); | 915 | pci_disable_device(pci); |
916 | return -ENXIO; | 916 | return -ENXIO; |
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c index 9ec122383eef..7b72c88e449d 100644 --- a/sound/pci/au88x0/au88x0.c +++ b/sound/pci/au88x0/au88x0.c | |||
@@ -151,8 +151,8 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip) | |||
151 | // check PCI availability (DMA). | 151 | // check PCI availability (DMA). |
152 | if ((err = pci_enable_device(pci)) < 0) | 152 | if ((err = pci_enable_device(pci)) < 0) |
153 | return err; | 153 | return err; |
154 | if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 || | 154 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 || |
155 | pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) { | 155 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) { |
156 | printk(KERN_ERR "error to set DMA mask\n"); | 156 | printk(KERN_ERR "error to set DMA mask\n"); |
157 | pci_disable_device(pci); | 157 | pci_disable_device(pci); |
158 | return -ENXIO; | 158 | return -ENXIO; |
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 8eea29fc42fe..4d34bb0d99d3 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c | |||
@@ -279,8 +279,8 @@ static int __devinit snd_aw2_create(struct snd_card *card, | |||
279 | pci_set_master(pci); | 279 | pci_set_master(pci); |
280 | 280 | ||
281 | /* check PCI availability (32bit DMA) */ | 281 | /* check PCI availability (32bit DMA) */ |
282 | if ((pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) || | 282 | if ((pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) || |
283 | (pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0)) { | 283 | (pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0)) { |
284 | printk(KERN_ERR "aw2: Impossible to set 32bit mask DMA\n"); | 284 | printk(KERN_ERR "aw2: Impossible to set 32bit mask DMA\n"); |
285 | pci_disable_device(pci); | 285 | pci_disable_device(pci); |
286 | return -ENXIO; | 286 | return -ENXIO; |
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index df757575798a..bfac30f7929f 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -1589,8 +1589,8 @@ static int __devinit snd_ca0106_create(int dev, struct snd_card *card, | |||
1589 | err = pci_enable_device(pci); | 1589 | err = pci_enable_device(pci); |
1590 | if (err < 0) | 1590 | if (err < 0) |
1591 | return err; | 1591 | return err; |
1592 | if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 || | 1592 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 || |
1593 | pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) { | 1593 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) { |
1594 | printk(KERN_ERR "error to set 32bit mask DMA\n"); | 1594 | printk(KERN_ERR "error to set 32bit mask DMA\n"); |
1595 | pci_disable_device(pci); | 1595 | pci_disable_device(pci); |
1596 | return -ENXIO; | 1596 | return -ENXIO; |
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c index c89ed1f5bc2b..05f56e04849b 100644 --- a/sound/pci/cs5535audio/cs5535audio.c +++ b/sound/pci/cs5535audio/cs5535audio.c | |||
@@ -285,8 +285,8 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card, | |||
285 | if ((err = pci_enable_device(pci)) < 0) | 285 | if ((err = pci_enable_device(pci)) < 0) |
286 | return err; | 286 | return err; |
287 | 287 | ||
288 | if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0 || | 288 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 || |
289 | pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK) < 0) { | 289 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) { |
290 | printk(KERN_WARNING "unable to get 32bit dma\n"); | 290 | printk(KERN_WARNING "unable to get 32bit dma\n"); |
291 | err = -ENXIO; | 291 | err = -ENXIO; |
292 | goto pcifail; | 292 | goto pcifail; |
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index c1eb84a14c42..82bc5b9e7629 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
@@ -1291,7 +1291,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci, | |||
1291 | pci_set_master(pci); | 1291 | pci_set_master(pci); |
1292 | 1292 | ||
1293 | /* check if we can restrict PCI DMA transfers to 32 bits */ | 1293 | /* check if we can restrict PCI DMA transfers to 32 bits */ |
1294 | if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) { | 1294 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) { |
1295 | snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n"); | 1295 | snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n"); |
1296 | pci_disable_device(pci); | 1296 | pci_disable_device(pci); |
1297 | return -ENXIO; | 1297 | return -ENXIO; |
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 80e064a3efff..833e9c7b27c7 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c | |||
@@ -1449,7 +1449,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, | |||
1449 | pci_set_master(pci); | 1449 | pci_set_master(pci); |
1450 | 1450 | ||
1451 | /* check if we can restrict PCI DMA transfers to 32 bits */ | 1451 | /* check if we can restrict PCI DMA transfers to 32 bits */ |
1452 | if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) { | 1452 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) { |
1453 | snd_printk(KERN_ERR "architecture does not support " | 1453 | snd_printk(KERN_ERR "architecture does not support " |
1454 | "32bit PCI busmaster DMA\n"); | 1454 | "32bit PCI busmaster DMA\n"); |
1455 | pci_disable_device(pci); | 1455 | pci_disable_device(pci); |