| Message ID | 20201121081632.1330159-1-christophe.jaillet@wanadoo.fr |
|---|---|
| State | Accepted |
| Commit | 9ac05523d38d4c2f40c9e41fc1453146fcd74368 |
| Headers | show |
| Series | ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code | expand |
On Sat, 21 Nov 2020 09:16:32 +0100, Christophe JAILLET wrote: > > '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. It's a good cleanup, but ... > 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. ... this will make it inconsistent with other error message lines in the same function, OTOH. So I don't think this part necessary to be changed. thanks, Takashi
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; }
'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(-)