Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85dc0f85 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pcm: Simplify check for dma_mmap_coherent() availability 



We check the availability of dma_mmap_coherent() in hw_support_mmap()
but with an ugly ifdef of lots of arch-checks.  Now we have a nice
CONFIG_ARCH_NO_COHERENT_DMA_MMAP kconfig, and this can be used
together with CONFIG_HAS_DMA check for a cleaner and more
comprehensive check.

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

sound/core/pcm_native.c

+2 −4
Original line number Diff line number Diff line
@@ -238,10 +238,8 @@ static bool hw_support_mmap(struct snd_pcm_substream *substream) 
{

	if (!(substream->runtime->hw.info & SNDRV_PCM_INFO_MMAP))

		return false;

	/* check architectures that return -EINVAL from dma_mmap_coherent() */

	/* FIXME: this should be some global flag */

#if defined(CONFIG_C6X) || defined(CONFIG_FRV) || defined(CONFIG_MN10300) ||\

	defined(CONFIG_PARISC) || defined(CONFIG_XTENSA)

	/* 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;