openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: emu10k1: use dma_set_mask_and_coherent() 

We have been calling dma_set_mask() and then dma_set_coherent_mask() with
the same value, but there is a dma_set_mask_and_coherent() function that
does exactly that so let's use it instead.

Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Maciej S. Szmigiero 2018-02-14 00:05:16 +01:00 committed by Takashi Iwai
parent a4463c92db
commit 70d0bc7dca
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/pci/emu10k1/emu10k1_main.c
View File

@ -1871,8 +1871,7 @@ int snd_emu10k1_create(struct snd_card *card,
emu->address_mode = is_audigy ? 0 : 1; emu->address_mode = is_audigy ? 0 : 1;
/* set the DMA transfer mask */ /* set the DMA transfer mask */
emu->dma_mask = emu->address_mode ? EMU10K1_DMA_MASK : AUDIGY_DMA_MASK; emu->dma_mask = emu->address_mode ? EMU10K1_DMA_MASK : AUDIGY_DMA_MASK;
if (dma_set_mask(&pci->dev, emu->dma_mask) < 0 || if (dma_set_mask_and_coherent(&pci->dev, emu->dma_mask) < 0) {
dma_set_coherent_mask(&pci->dev, emu->dma_mask) < 0) {
dev_err(card->dev, dev_err(card->dev,
"architecture does not support PCI busmaster DMA with mask 0x%lx\n", "architecture does not support PCI busmaster DMA with mask 0x%lx\n",
emu->dma_mask); emu->dma_mask);