Commit 9ac05523 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Takashi Iwai
Browse files

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/20201121083747.1330299-1-christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e714fa93

sound/pci/emu10k1/emu10k1x.c

+2 −2
Original line number Diff line number Diff line
@@ -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;