aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@nuerscht.ch>2006-04-11 01:54:21 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 09:18:44 -0400
commit56b146d36db933844011d5026c6f55593037c7b8 (patch)
treee8b9bed7bf22f658f9b62bf13e512bf08f137efc /sound/pci
parent31cc48bfeef7a021d6e29f3454a4505edcfd6daa (diff)
[PATCH] Last DMA_xBIT_MASK cleanups
These are the last conversions of pci_set_dma_mask(), pci_set_consistent_dma_mask() and pci_dma_supported() to use DMA_xBIT_MASK constants from linux/dma-mapping.h Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/als300.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 37b80570a5c6..91899f87f037 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -35,6 +35,7 @@
35#include <linux/init.h> 35#include <linux/init.h>
36#include <linux/moduleparam.h> 36#include <linux/moduleparam.h>
37#include <linux/pci.h> 37#include <linux/pci.h>
38#include <linux/dma-mapping.h>
38#include <linux/interrupt.h> 39#include <linux/interrupt.h>
39#include <linux/slab.h> 40#include <linux/slab.h>
40 41
@@ -691,8 +692,8 @@ static int __devinit snd_als300_create(snd_card_t *card,
691 if ((err = pci_enable_device(pci)) < 0) 692 if ((err = pci_enable_device(pci)) < 0)
692 return err; 693 return err;
693 694
694 if (pci_set_dma_mask(pci, 0x0fffffff) < 0 || 695 if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||
695 pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) { 696 pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {
696 printk(KERN_ERR "error setting 28bit DMA mask\n"); 697 printk(KERN_ERR "error setting 28bit DMA mask\n");
697 pci_disable_device(pci); 698 pci_disable_device(pci);
698 return -ENXIO; 699 return -ENXIO;