diff options
| author | Maciej S. Szmigiero <mail@maciej.szmigiero.name> | 2018-02-14 00:05:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-02-14 07:46:51 +0100 |
| commit | 70d0bc7dca918a0add6da817bae70f334fb4cc60 (patch) | |
| tree | 1f72e51c2885486a6b916b66cad57349a570bd1b /sound/pci/emu10k1 | |
| parent | ALSA: emu10k1: remove reserved_page (diff) | |
| download | linux-70d0bc7dca918a0add6da817bae70f334fb4cc60.tar.xz linux-70d0bc7dca918a0add6da817bae70f334fb4cc60.zip | |
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>
Diffstat (limited to 'sound/pci/emu10k1')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index a0a4d31ded53..11e868f569d6 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1871,8 +1871,7 @@ int snd_emu10k1_create(struct snd_card *card, emu->address_mode = is_audigy ? 0 : 1; /* set the DMA transfer mask */ emu->dma_mask = emu->address_mode ? EMU10K1_DMA_MASK : AUDIGY_DMA_MASK; - if (dma_set_mask(&pci->dev, emu->dma_mask) < 0 || - dma_set_coherent_mask(&pci->dev, emu->dma_mask) < 0) { + if (dma_set_mask_and_coherent(&pci->dev, emu->dma_mask) < 0) { dev_err(card->dev, "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu->dma_mask); |