diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-01-14 13:54:11 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-01-15 11:17:00 +0100 |
commit | 669f65eaeb969ef60811939a5811479d3e8087af (patch) | |
tree | d42affa360bbb22e5ed38a6af0dcded1f6513362 /sound/pci/hda/hda_intel.c | |
parent | ALSA: dice: add support for Lexicon I-ONIX FW810s (diff) | |
download | linux-dev-669f65eaeb969ef60811939a5811479d3e8087af.tar.xz linux-dev-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/hda/hda_intel.c')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 694d95e3a46e..292d3ff44709 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1967,12 +1967,8 @@ static int azx_first_init(struct azx *chip) /* allow 64bit DMA address if supported by H/W */ if (!(gcap & AZX_GCAP_64OK)) dma_bits = 32; - if (!dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) { - dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(dma_bits)); - } else { - dma_set_mask(&pci->dev, DMA_BIT_MASK(32)); - dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)); - } + if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(dma_bits))) + dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(32)); /* read number of streams from GCAP register instead of using * hardcoded value |