diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-08-03 12:31:59 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-09-04 11:13:18 +0200 |
| commit | 425da159707b271dc865d7e167ac104a0e60e4af (patch) | |
| tree | b4876e8475f887c32880588e20d56296923efee1 /sound/core | |
| parent | dma-mapping: add a dma_can_mmap helper (diff) | |
| download | linux-425da159707b271dc865d7e167ac104a0e60e4af.tar.xz linux-425da159707b271dc865d7e167ac104a0e60e4af.zip | |
ALSA: pcm: use dma_can_mmap() to check if a device supports dma_mmap_*
Replace the local hack with the dma_can_mmap helper to check if
a given device supports mapping DMA allocations to userspace.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm_native.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 703857aab00f..9763c18e176a 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -220,13 +220,12 @@ static bool hw_support_mmap(struct snd_pcm_substream *substream) { if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_MMAP)) return false; - /* architecture supports dma_mmap_coherent()? */ -#if defined(CONFIG_ARCH_NO_COHERENT_DMA_MMAP) || !defined(CONFIG_HAS_DMA) - if (!substream->ops->mmap && - substream->dma_buffer.dev.type == SNDRV_DMA_TYPE_DEV) - return false; -#endif - return true; + + if (substream->ops->mmap || + substream->dma_buffer.dev.type != SNDRV_DMA_TYPE_DEV) + return true; + + return dma_can_mmap(substream->dma_buffer.dev.dev); } static int constrain_mask_params(struct snd_pcm_substream *substream, |