lkml.org 
[lkml]   [2020]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code
Date
'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.

With at it replace the 'card->dev' parameter passed to a 'dev_err()' call
by an equivalent '&pci->dev' which is more consistent with the test just
one line above.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
sound/pci/emu10k1/emu10k1x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index def8161cde4c..f2b6fd434474 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -894,9 +894,9 @@ 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) {
- dev_err(card->dev, "error to set 28bit mask DMA\n");
+
+ if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28)) < 0) {
+ dev_err(&pci->dev, "error to set 28bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;
}
--
2.27.0
\
 
 \ /
  Last update: 2020-11-21 09:18    [W:0.028 / U:1.468 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site