summaryrefslogtreecommitdiffstats
path: root/sound/pci/sonicvibes.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-01-14 13:54:11 +0100
committerTakashi Iwai <tiwai@suse.de>2021-01-15 11:17:00 +0100
commit669f65eaeb969ef60811939a5811479d3e8087af (patch)
treed42affa360bbb22e5ed38a6af0dcded1f6513362 /sound/pci/sonicvibes.c
parent9a08676fc5968be8575ee2fa8926e55d8aef166c (diff)
downloadlinux-stable-669f65eaeb969ef60811939a5811479d3e8087af.tar.gz
linux-stable-669f65eaeb969ef60811939a5811479d3e8087af.tar.bz2
linux-stable-669f65eaeb969ef60811939a5811479d3e8087af.zip
ALSA: pci: Simplify with dma_set_mask_and_coherent()
Many PCI drivers still have two explicit calls of dma_set_mask() and dma_set_coherent_mask(). Let's simplify with dma_set_mask_and_coherent(). Link: https://lore.kernel.org/r/20210114125412.993-2-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/sonicvibes.c')
-rw-r--r--sound/pci/sonicvibes.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index bd805e416e12..26fd1d08c179 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1230,8 +1230,7 @@ static int snd_sonicvibes_create(struct snd_card *card,
if ((err = pci_enable_device(pci)) < 0)
return err;
/* check, if we can restrict PCI DMA transfers to 24 bits */
- if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
- dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
+ if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(24))) {
dev_err(card->dev,
"architecture does not support 24bit PCI busmaster DMA\n");
pci_disable_device(pci);