summaryrefslogtreecommitdiff
path: root/sound/pci/aw2
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-01-14 15:54:11 +0300
committerTakashi Iwai <tiwai@suse.de>2021-01-15 13:17:00 +0300
commit669f65eaeb969ef60811939a5811479d3e8087af (patch)
treed42affa360bbb22e5ed38a6af0dcded1f6513362 /sound/pci/aw2
parent9a08676fc5968be8575ee2fa8926e55d8aef166c (diff)
downloadlinux-669f65eaeb969ef60811939a5811479d3e8087af.tar.xz
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/aw2')
-rw-r--r--sound/pci/aw2/aw2-alsa.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index f1865afedc59..43396849a01c 100644
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -236,8 +236,7 @@ static int snd_aw2_create(struct snd_card *card,
pci_set_master(pci);
/* check PCI availability (32bit DMA) */
- if ((dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) ||
- (dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0)) {
+ if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(32))) {
dev_err(card->dev, "Impossible to set 32bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;