kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ALSA] au88x0: Remove unneeded call to pci_dma_supported()

Browse source 
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>
This commit is contained in:
Tobias Klauser 2005-12-01 11:14:00 +01:00 committed by Jaroslav Kysela
parent 59d4858250
commit 58da3a23fe
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/pci/au88x0/au88x0.c
View file

@ -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)

2
sound/pci/au88x0/au88x0.h
View file

@ -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))