aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/esssolo1.c2
-rw-r--r--sound/oss/sonicvibes.c3
-rw-r--r--sound/pci/ad1889.c1
-rw-r--r--sound/pci/ali5451/ali5451.c5
-rw-r--r--sound/pci/als4000.c5
-rw-r--r--sound/pci/azt3328.c5
-rw-r--r--sound/pci/emu10k1/emu10k1x.c1
-rw-r--r--sound/pci/es1938.c5
-rw-r--r--sound/pci/es1968.c1
-rw-r--r--sound/pci/ice1712/ice1712.c2
-rw-r--r--sound/pci/maestro3.c1
-rw-r--r--sound/pci/mixart/mixart.c2
-rw-r--r--sound/pci/pcxhr/pcxhr.c1
-rw-r--r--sound/pci/sonicvibes.c5
-rw-r--r--sound/pci/trident/trident_main.c5
15 files changed, 30 insertions, 14 deletions
diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c
index 78d3e29ce968..6861563d7525 100644
--- a/sound/oss/esssolo1.c
+++ b/sound/oss/esssolo1.c
@@ -2348,7 +2348,7 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device
2348 /* Recording requires 24-bit DMA, so attempt to set dma mask 2348 /* Recording requires 24-bit DMA, so attempt to set dma mask
2349 * to 24 bits first, then 32 bits (playback only) if that fails. 2349 * to 24 bits first, then 32 bits (playback only) if that fails.
2350 */ 2350 */
2351 if (pci_set_dma_mask(pcidev, 0x00ffffff) && 2351 if (pci_set_dma_mask(pcidev, DMA_24BIT_MASK) &&
2352 pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) { 2352 pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) {
2353 printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n"); 2353 printk(KERN_WARNING "solo1: architecture does not support 24bit or 32bit PCI busmaster DMA\n");
2354 return -ENODEV; 2354 return -ENODEV;
diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index 4471757b7985..42bd276cfc39 100644
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -116,6 +116,7 @@
116#include <linux/spinlock.h> 116#include <linux/spinlock.h>
117#include <linux/smp_lock.h> 117#include <linux/smp_lock.h>
118#include <linux/gameport.h> 118#include <linux/gameport.h>
119#include <linux/dma-mapping.h>
119#include <linux/mutex.h> 120#include <linux/mutex.h>
120 121
121 122
@@ -2535,7 +2536,7 @@ static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id
2535 return -ENODEV; 2536 return -ENODEV;
2536 if (pcidev->irq == 0) 2537 if (pcidev->irq == 0)
2537 return -ENODEV; 2538 return -ENODEV;
2538 if (pci_set_dma_mask(pcidev, 0x00ffffff)) { 2539 if (pci_set_dma_mask(pcidev, DMA_24BIT_MASK)) {
2539 printk(KERN_WARNING "sonicvibes: architecture does not support 24bit PCI busmaster DMA\n"); 2540 printk(KERN_WARNING "sonicvibes: architecture does not support 24bit PCI busmaster DMA\n");
2540 return -ENODEV; 2541 return -ENODEV;
2541 } 2542 }
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 2aa5a7fdb6e0..c6c8333acc62 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -39,6 +39,7 @@
39#include <linux/interrupt.h> 39#include <linux/interrupt.h>
40#include <linux/compiler.h> 40#include <linux/compiler.h>
41#include <linux/delay.h> 41#include <linux/delay.h>
42#include <linux/dma-mapping.h>
42 43
43#include <sound/driver.h> 44#include <sound/driver.h>
44#include <sound/core.h> 45#include <sound/core.h>
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index e264136e8fb4..fc92b6896c24 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -33,6 +33,7 @@
33#include <linux/pci.h> 33#include <linux/pci.h>
34#include <linux/slab.h> 34#include <linux/slab.h>
35#include <linux/moduleparam.h> 35#include <linux/moduleparam.h>
36#include <linux/dma-mapping.h>
36#include <sound/core.h> 37#include <sound/core.h>
37#include <sound/pcm.h> 38#include <sound/pcm.h>
38#include <sound/info.h> 39#include <sound/info.h>
@@ -2220,8 +2221,8 @@ static int __devinit snd_ali_create(struct snd_card *card,
2220 if ((err = pci_enable_device(pci)) < 0) 2221 if ((err = pci_enable_device(pci)) < 0)
2221 return err; 2222 return err;
2222 /* check, if we can restrict PCI DMA transfers to 31 bits */ 2223 /* check, if we can restrict PCI DMA transfers to 31 bits */
2223 if (pci_set_dma_mask(pci, 0x7fffffff) < 0 || 2224 if (pci_set_dma_mask(pci, DMA_31BIT_MASK) < 0 ||
2224 pci_set_consistent_dma_mask(pci, 0x7fffffff) < 0) { 2225 pci_set_consistent_dma_mask(pci, DMA_31BIT_MASK) < 0) {
2225 snd_printk(KERN_ERR "architecture does not support 31bit PCI busmaster DMA\n"); 2226 snd_printk(KERN_ERR "architecture does not support 31bit PCI busmaster DMA\n");
2226 pci_disable_device(pci); 2227 pci_disable_device(pci);
2227 return -ENXIO; 2228 return -ENXIO;
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index 7b2ff5f4672e..100d8127a411 100644
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -70,6 +70,7 @@
70#include <linux/slab.h> 70#include <linux/slab.h>
71#include <linux/gameport.h> 71#include <linux/gameport.h>
72#include <linux/moduleparam.h> 72#include <linux/moduleparam.h>
73#include <linux/dma-mapping.h>
73#include <sound/core.h> 74#include <sound/core.h>
74#include <sound/pcm.h> 75#include <sound/pcm.h>
75#include <sound/rawmidi.h> 76#include <sound/rawmidi.h>
@@ -688,8 +689,8 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci,
688 return err; 689 return err;
689 } 690 }
690 /* check, if we can restrict PCI DMA transfers to 24 bits */ 691 /* check, if we can restrict PCI DMA transfers to 24 bits */
691 if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || 692 if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
692 pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { 693 pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
693 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); 694 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
694 pci_disable_device(pci); 695 pci_disable_device(pci);
695 return -ENXIO; 696 return -ENXIO;
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index e077eb3fbe2f..680077e1e057 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -104,6 +104,7 @@
104#include <linux/slab.h> 104#include <linux/slab.h>
105#include <linux/gameport.h> 105#include <linux/gameport.h>
106#include <linux/moduleparam.h> 106#include <linux/moduleparam.h>
107#include <linux/dma-mapping.h>
107#include <sound/core.h> 108#include <sound/core.h>
108#include <sound/control.h> 109#include <sound/control.h>
109#include <sound/pcm.h> 110#include <sound/pcm.h>
@@ -1669,8 +1670,8 @@ snd_azf3328_create(struct snd_card *card,
1669 chip->irq = -1; 1670 chip->irq = -1;
1670 1671
1671 /* check if we can restrict PCI DMA transfers to 24 bits */ 1672 /* check if we can restrict PCI DMA transfers to 24 bits */
1672 if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || 1673 if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
1673 pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { 1674 pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
1674 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); 1675 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
1675 err = -ENXIO; 1676 err = -ENXIO;
1676 goto out_err; 1677 goto out_err;
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 2208dbd48be9..3e332f398162 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -36,6 +36,7 @@
36#include <linux/dma-mapping.h> 36#include <linux/dma-mapping.h>
37#include <linux/slab.h> 37#include <linux/slab.h>
38#include <linux/moduleparam.h> 38#include <linux/moduleparam.h>
39#include <linux/dma-mapping.h>
39#include <sound/core.h> 40#include <sound/core.h>
40#include <sound/initval.h> 41#include <sound/initval.h>
41#include <sound/pcm.h> 42#include <sound/pcm.h>
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 0d556b09ad04..4d62fe439177 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -55,6 +55,7 @@
55#include <linux/gameport.h> 55#include <linux/gameport.h>
56#include <linux/moduleparam.h> 56#include <linux/moduleparam.h>
57#include <linux/delay.h> 57#include <linux/delay.h>
58#include <linux/dma-mapping.h>
58#include <sound/core.h> 59#include <sound/core.h>
59#include <sound/control.h> 60#include <sound/control.h>
60#include <sound/pcm.h> 61#include <sound/pcm.h>
@@ -1517,8 +1518,8 @@ static int __devinit snd_es1938_create(struct snd_card *card,
1517 if ((err = pci_enable_device(pci)) < 0) 1518 if ((err = pci_enable_device(pci)) < 0)
1518 return err; 1519 return err;
1519 /* check, if we can restrict PCI DMA transfers to 24 bits */ 1520 /* check, if we can restrict PCI DMA transfers to 24 bits */
1520 if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || 1521 if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
1521 pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { 1522 pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
1522 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); 1523 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
1523 pci_disable_device(pci); 1524 pci_disable_device(pci);
1524 return -ENXIO; 1525 return -ENXIO;
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index dd465a186e11..e3ad17f53c29 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -104,6 +104,7 @@
104#include <linux/slab.h> 104#include <linux/slab.h>
105#include <linux/gameport.h> 105#include <linux/gameport.h>
106#include <linux/moduleparam.h> 106#include <linux/moduleparam.h>
107#include <linux/dma-mapping.h>
107#include <linux/mutex.h> 108#include <linux/mutex.h>
108 109
109#include <sound/core.h> 110#include <sound/core.h>
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 672e198317e1..b88eeba2f5d1 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -56,7 +56,9 @@
56#include <linux/dma-mapping.h> 56#include <linux/dma-mapping.h>
57#include <linux/slab.h> 57#include <linux/slab.h>
58#include <linux/moduleparam.h> 58#include <linux/moduleparam.h>
59#include <linux/dma-mapping.h>
59#include <linux/mutex.h> 60#include <linux/mutex.h>
61
60#include <sound/core.h> 62#include <sound/core.h>
61#include <sound/cs8427.h> 63#include <sound/cs8427.h>
62#include <sound/info.h> 64#include <sound/info.h>
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 8bc084956c28..44393e190929 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -41,6 +41,7 @@
41#include <linux/slab.h> 41#include <linux/slab.h>
42#include <linux/vmalloc.h> 42#include <linux/vmalloc.h>
43#include <linux/moduleparam.h> 43#include <linux/moduleparam.h>
44#include <linux/dma-mapping.h>
44#include <sound/core.h> 45#include <sound/core.h>
45#include <sound/info.h> 46#include <sound/info.h>
46#include <sound/control.h> 47#include <sound/control.h>
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 43ee3b2b948f..b5a095052d4c 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -28,6 +28,8 @@
28#include <linux/dma-mapping.h> 28#include <linux/dma-mapping.h>
29#include <linux/moduleparam.h> 29#include <linux/moduleparam.h>
30#include <linux/mutex.h> 30#include <linux/mutex.h>
31#include <linux/dma-mapping.h>
32
31#include <sound/core.h> 33#include <sound/core.h>
32#include <sound/initval.h> 34#include <sound/initval.h>
33#include <sound/info.h> 35#include <sound/info.h>
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index f679779d96e3..35875c8aa299 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -30,6 +30,7 @@
30#include <linux/delay.h> 30#include <linux/delay.h>
31#include <linux/moduleparam.h> 31#include <linux/moduleparam.h>
32#include <linux/mutex.h> 32#include <linux/mutex.h>
33#include <linux/dma-mapping.h>
33 34
34#include <sound/core.h> 35#include <sound/core.h>
35#include <sound/initval.h> 36#include <sound/initval.h>
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 7bbea3738b8a..2d66a09fe5ee 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -30,6 +30,7 @@
30#include <linux/slab.h> 30#include <linux/slab.h>
31#include <linux/gameport.h> 31#include <linux/gameport.h>
32#include <linux/moduleparam.h> 32#include <linux/moduleparam.h>
33#include <linux/dma-mapping.h>
33 34
34#include <sound/core.h> 35#include <sound/core.h>
35#include <sound/pcm.h> 36#include <sound/pcm.h>
@@ -1227,8 +1228,8 @@ static int __devinit snd_sonicvibes_create(struct snd_card *card,
1227 if ((err = pci_enable_device(pci)) < 0) 1228 if ((err = pci_enable_device(pci)) < 0)
1228 return err; 1229 return err;
1229 /* check, if we can restrict PCI DMA transfers to 24 bits */ 1230 /* check, if we can restrict PCI DMA transfers to 24 bits */
1230 if (pci_set_dma_mask(pci, 0x00ffffff) < 0 || 1231 if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 ||
1231 pci_set_consistent_dma_mask(pci, 0x00ffffff) < 0) { 1232 pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) {
1232 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); 1233 snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
1233 pci_disable_device(pci); 1234 pci_disable_device(pci);
1234 return -ENXIO; 1235 return -ENXIO;
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 83b7d8aba9e6..52178b8ad49d 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -35,6 +35,7 @@
35#include <linux/slab.h> 35#include <linux/slab.h>
36#include <linux/vmalloc.h> 36#include <linux/vmalloc.h>
37#include <linux/gameport.h> 37#include <linux/gameport.h>
38#include <linux/dma-mapping.h>
38 39
39#include <sound/core.h> 40#include <sound/core.h>
40#include <sound/info.h> 41#include <sound/info.h>
@@ -3554,8 +3555,8 @@ int __devinit snd_trident_create(struct snd_card *card,
3554 if ((err = pci_enable_device(pci)) < 0) 3555 if ((err = pci_enable_device(pci)) < 0)
3555 return err; 3556 return err;
3556 /* check, if we can restrict PCI DMA transfers to 30 bits */ 3557 /* check, if we can restrict PCI DMA transfers to 30 bits */
3557 if (pci_set_dma_mask(pci, 0x3fffffff) < 0 || 3558 if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0 ||
3558 pci_set_consistent_dma_mask(pci, 0x3fffffff) < 0) { 3559 pci_set_consistent_dma_mask(pci, DMA_30BIT_MASK) < 0) {
3559 snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n"); 3560 snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n");
3560 pci_disable_device(pci); 3561 pci_disable_device(pci);
3561 return -ENXIO; 3562 return -ENXIO;
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-26 15:25:01 -0500