summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorYang Hongyang <yanghy@cn.fujitsu.com>2009-04-07 04:01:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 17:31:11 +0200
commit28b767967763835d8526f6baedc25a8a86052640 (patch)
tree32dc0df187bd1906bf49f47ecbdda60d21b5c124 /sound
parentdma-mapping: replace all DMA_31BIT_MASK macro with DMA_BIT_MASK(31) (diff)
downloadlinux-28b767967763835d8526f6baedc25a8a86052640.tar.xz
linux-28b767967763835d8526f6baedc25a8a86052640.zip
dma-mapping: replace all DMA_30BIT_MASK macro with DMA_BIT_MASK(30)
Replace all DMA_30BIT_MASK macro with DMA_BIT_MASK(30) 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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/sis7019.c2
-rw-r--r--sound/pci/trident/trident_main.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index baf6d8e3dabc..1a5ff0611072 100644
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -1300,7 +1300,7 @@ static int __devinit sis_chip_create(struct snd_card *card,
if (rc)
goto error_out;
- if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0) {
+ if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0) {
printk(KERN_ERR "sis7019: architecture does not support "
"30-bit PCI busmaster DMA");
goto error_out_enabled;
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index a9da9c184660..6d943f6f6b70 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3559,8 +3559,8 @@ int __devinit snd_trident_create(struct snd_card *card,
if ((err = pci_enable_device(pci)) < 0)
return err;
/* check, if we can restrict PCI DMA transfers to 30 bits */
- if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0 ||
- pci_set_consistent_dma_mask(pci, DMA_30BIT_MASK) < 0) {
+ if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0 ||
+ pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(30)) < 0) {
snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;