diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:12 -0400 |
commit | 2f4f27d42a301ed147e50c2edbcd27bb8990bc8e (patch) | |
tree | 48d3ddb39d97bd7b9a176395c5a97b0001b2b84c /sound | |
parent | ce0b620160e6d15a7f5b4b00cd7b8bd956d427d1 (diff) |
dma-mapping: replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24)
Replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24)
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/als4000.c | 4 | ||||
-rw-r--r-- | sound/pci/azt3328.c | 4 | ||||
-rw-r--r-- | sound/pci/es1938.c | 4 | ||||
-rw-r--r-- | sound/pci/sonicvibes.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c index 542a0c65a92c..3dbacde1a5af 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c | |||
@@ -872,8 +872,8 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci, | |||
872 | return err; | 872 | return err; |
873 | } | 873 | } |
874 | /* check, if we can restrict PCI DMA transfers to 24 bits */ | 874 | /* check, if we can restrict PCI DMA transfers to 24 bits */ |
875 | if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 || | 875 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 || |
876 | pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) { | 876 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) { |
877 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); | 877 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); |
878 | pci_disable_device(pci); | 878 | pci_disable_device(pci); |
879 | return -ENXIO; | 879 | return -ENXIO; |
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index e9e9b5821d41..f290bc56178f 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c | |||
@@ -2125,8 +2125,8 @@ snd_azf3328_create(struct snd_card *card, | |||
2125 | chip->irq = -1; | 2125 | chip->irq = -1; |
2126 | 2126 | ||
2127 | /* check if we can restrict PCI DMA transfers to 24 bits */ | 2127 | /* check if we can restrict PCI DMA transfers to 24 bits */ |
2128 | if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 || | 2128 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 || |
2129 | pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) { | 2129 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) { |
2130 | snd_printk(KERN_ERR "architecture does not support " | 2130 | snd_printk(KERN_ERR "architecture does not support " |
2131 | "24bit PCI busmaster DMA\n" | 2131 | "24bit PCI busmaster DMA\n" |
2132 | ); | 2132 | ); |
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index dd63b132fb8e..fbd2ac09aa34 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
@@ -1608,8 +1608,8 @@ static int __devinit snd_es1938_create(struct snd_card *card, | |||
1608 | if ((err = pci_enable_device(pci)) < 0) | 1608 | if ((err = pci_enable_device(pci)) < 0) |
1609 | return err; | 1609 | return err; |
1610 | /* check, if we can restrict PCI DMA transfers to 24 bits */ | 1610 | /* check, if we can restrict PCI DMA transfers to 24 bits */ |
1611 | if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 || | 1611 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 || |
1612 | pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) { | 1612 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) { |
1613 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); | 1613 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); |
1614 | pci_disable_device(pci); | 1614 | pci_disable_device(pci); |
1615 | return -ENXIO; | 1615 | return -ENXIO; |
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c index d989215f3556..7dc60ad4772e 100644 --- a/sound/pci/sonicvibes.c +++ b/sound/pci/sonicvibes.c | |||
@@ -1264,8 +1264,8 @@ static int __devinit snd_sonicvibes_create(struct snd_card *card, | |||
1264 | if ((err = pci_enable_device(pci)) < 0) | 1264 | if ((err = pci_enable_device(pci)) < 0) |
1265 | return err; | 1265 | return err; |
1266 | /* check, if we can restrict PCI DMA transfers to 24 bits */ | 1266 | /* check, if we can restrict PCI DMA transfers to 24 bits */ |
1267 | if (pci_set_dma_mask(pci, DMA_24BIT_MASK) < 0 || | 1267 | if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 || |
1268 | pci_set_consistent_dma_mask(pci, DMA_24BIT_MASK) < 0) { | 1268 | pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) { |
1269 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); | 1269 | snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n"); |
1270 | pci_disable_device(pci); | 1270 | pci_disable_device(pci); |
1271 | return -ENXIO; | 1271 | return -ENXIO; |