diff options
| author | Tobias Klauser <tklauser@nuerscht.ch> | 2005-12-01 13:14:00 +0300 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 14:30:12 +0300 |
| commit | 58da3a23fe12b1c4730cb85af203950c7707220c (patch) | |
| tree | a7c0bf00eb3e63cf81226174013f5715250bb15d | |
| parent | 59d48582508c6e3ed6f60bdd7d13e3e2893416b4 (diff) | |
| download | linux-58da3a23fe12b1c4730cb85af203950c7707220c.tar.xz | |
[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>
| -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 @@ #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/moduleparam.h> +#include <linux/dma-mapping.h> #include <sound/initval.h> // module parameters (see "Module Parameters") @@ -150,11 +151,10 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip) // check PCI availability (DMA). if ((err = pci_enable_device(pci)) < 0) return err; - if (!pci_dma_supported(pci, VORTEX_DMA_MASK)) { + if (pci_set_dma_mask(pci, DMA_32BIT_MASK)) { printk(KERN_ERR "error to set DMA mask\n"); return -ENXIO; } - pci_set_dma_mask(pci, VORTEX_DMA_MASK); chip = kzalloc(sizeof(*chip), GFP_KERNEL); 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 @@ #include "au88x0_wt.h" #endif -#define VORTEX_DMA_MASK 0xffffffff - #define hwread(x,y) readl((x)+((y)>>2)) #define hwwrite(x,y,z) writel((z),(x)+((y)>>2)) |