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>

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index a0a4d31ded53f2664b8d48f73f3c0f05f2ea28b1..11e868f569d62ff0e385f15a38815e6c84038d07 100644 (file)
--- 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);