diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:11 -0400 |
commit | 28b767967763835d8526f6baedc25a8a86052640 (patch) | |
tree | 32dc0df187bd1906bf49f47ecbdda60d21b5c124 /sound/pci | |
parent | 929a22a558429bd22001d6b41cf31c233c68a5e2 (diff) |
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/pci')
-rw-r--r-- | sound/pci/sis7019.c | 2 | ||||
-rw-r--r-- | sound/pci/trident/trident_main.c | 4 |
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, | |||
1300 | if (rc) | 1300 | if (rc) |
1301 | goto error_out; | 1301 | goto error_out; |
1302 | 1302 | ||
1303 | if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0) { | 1303 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0) { |
1304 | printk(KERN_ERR "sis7019: architecture does not support " | 1304 | printk(KERN_ERR "sis7019: architecture does not support " |
1305 | "30-bit PCI busmaster DMA"); | 1305 | "30-bit PCI busmaster DMA"); |
1306 | goto error_out_enabled; | 1306 | 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, | |||
3559 | if ((err = pci_enable_device(pci)) < 0) | 3559 | if ((err = pci_enable_device(pci)) < 0) |
3560 | return err; | 3560 | return err; |
3561 | /* check, if we can restrict PCI DMA transfers to 30 bits */ | 3561 | /* check, if we can restrict PCI DMA transfers to 30 bits */ |
3562 | if (pci_set_dma_mask(pci, DMA_30BIT_MASK) < 0 || | 3562 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0 || |
3563 | pci_set_consistent_dma_mask(pci, DMA_30BIT_MASK) < 0) { | 3563 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(30)) < 0) { |
3564 | snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n"); | 3564 | snd_printk(KERN_ERR "architecture does not support 30bit PCI busmaster DMA\n"); |
3565 | pci_disable_device(pci); | 3565 | pci_disable_device(pci); |
3566 | return -ENXIO; | 3566 | return -ENXIO; |