diff options
author | Tobias Klauser <tklauser@nuerscht.ch> | 2005-12-01 05:14:00 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:30:12 -0500 |
commit | 58da3a23fe12b1c4730cb85af203950c7707220c (patch) | |
tree | a7c0bf00eb3e63cf81226174013f5715250bb15d /sound | |
parent | 59d48582508c6e3ed6f60bdd7d13e3e2893416b4 (diff) |
[ALSA] au88x0: Remove unneeded call to pci_dma_supported()
Modules: au88x0 driver
pci_dma_supported() is called right before pci_set_dma_mask() which already
calls pci_dma_supported(). The attached patch removes the unneeded call to
pci_dma_supported()
Additionally the custom VORTEX_DMA_MASK macro is replaced by DMA_32BIT_MASK
from linux/dma-mapping.h
Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/au88x0/au88x0.c | 4 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c index 7c547859ae00..7d9184f7367a 100644 --- a/sound/pci/au88x0/au88x0.c +++ b/sound/pci/au88x0/au88x0.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/slab.h> | 20 | #include <linux/slab.h> |
21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
22 | #include <linux/moduleparam.h> | 22 | #include <linux/moduleparam.h> |
23 | #include <linux/dma-mapping.h> | ||
23 | #include <sound/initval.h> | 24 | #include <sound/initval.h> |
24 | 25 | ||
25 | // module parameters (see "Module Parameters") | 26 | // module parameters (see "Module Parameters") |
@@ -150,11 +151,10 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip) | |||
150 | // check PCI availability (DMA). | 151 | // check PCI availability (DMA). |
151 | if ((err = pci_enable_device(pci)) < 0) | 152 | if ((err = pci_enable_device(pci)) < 0) |
152 | return err; | 153 | return err; |
153 | if (!pci_dma_supported(pci, VORTEX_DMA_MASK)) { | 154 | if (pci_set_dma_mask(pci, DMA_32BIT_MASK)) { |
154 | printk(KERN_ERR "error to set DMA mask\n"); | 155 | printk(KERN_ERR "error to set DMA mask\n"); |
155 | return -ENXIO; | 156 | return -ENXIO; |
156 | } | 157 | } |
157 | pci_set_dma_mask(pci, VORTEX_DMA_MASK); | ||
158 | 158 | ||
159 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); | 159 | chip = kzalloc(sizeof(*chip), GFP_KERNEL); |
160 | if (chip == NULL) | 160 | if (chip == NULL) |
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h index 745f995a20dd..c2ad2674bea7 100644 --- a/sound/pci/au88x0/au88x0.h +++ b/sound/pci/au88x0/au88x0.h | |||
@@ -39,8 +39,6 @@ | |||
39 | #include "au88x0_wt.h" | 39 | #include "au88x0_wt.h" |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | #define VORTEX_DMA_MASK 0xffffffff | ||
43 | |||
44 | #define hwread(x,y) readl((x)+((y)>>2)) | 42 | #define hwread(x,y) readl((x)+((y)>>2)) |
45 | #define hwwrite(x,y,z) writel((z),(x)+((y)>>2)) | 43 | #define hwwrite(x,y,z) writel((z),(x)+((y)>>2)) |
46 | 44 | ||