diff options
| author |   Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2020-11-21 09:37:47 +0100 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2020-11-21 10:32:43 +0100 |
| commit | 9ac05523d38d4c2f40c9e41fc1453146fcd74368 (patch) | |
| tree | e4d336925bde0dbb8b3eb37bf9e856afc3823e5b /sound/pci | |
| parent | ALSA: aloop: Constify ops structs (diff) | |
| download | linux-dev-9ac05523d38d4c2f40c9e41fc1453146fcd74368.tar.xz linux-dev-9ac05523d38d4c2f40c9e41fc1453146fcd74368.zip | |
ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code
'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/20201121083747.1330299-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index def8161cde4c..785ec0cf3933 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c @@ -894,8 +894,8 @@ static int snd_emu10k1x_create(struct snd_card *card, if ((err = pci_enable_device(pci)) < 0) return err; - if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || - pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { + + if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28)) < 0) { dev_err(card->dev, "error to set 28bit mask DMA\n"); pci_disable_device(pci); return -ENXIO; |