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

Commit a3935a29 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: blackfin: bf5xx-i2s-pcm: Use snd_pcm_lib_preallocate_pages_for_all() 



Use snd_pcm_lib_preallocate_pages_for_all() for pre-allocating the DMA buffers
instead of re-implementing the same functionality.  Note that there is no need
to call snd_pcm_lib_free_pages_for_all() since the ALSA core takes care of this
for us.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 569ef65a

sound/soc/blackfin/bf5xx-i2s-pcm.c

+3 −60
Original line number Diff line number Diff line
@@ -209,55 +209,12 @@ static struct snd_pcm_ops bf5xx_pcm_i2s_ops = { 
	.mmap		= bf5xx_pcm_mmap,

};



static int bf5xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)

{

	struct snd_pcm_substream *substream = pcm->streams[stream].substream;

	struct snd_dma_buffer *buf = &substream->dma_buffer;

	size_t size = bf5xx_pcm_hardware.buffer_bytes_max;



	buf->dev.type = SNDRV_DMA_TYPE_DEV;

	buf->dev.dev = pcm->card->dev;

	buf->private_data = NULL;

	buf->area = dma_alloc_coherent(pcm->card->dev, size,

			&buf->addr, GFP_KERNEL);

	if (!buf->area) {

		pr_err("Failed to allocate dma memory - Please increase uncached DMA memory region\n");

		return -ENOMEM;

	}

	buf->bytes = size;



	pr_debug("%s, area:%p, size:0x%08lx\n", __func__,

		buf->area, buf->bytes);



	return 0;

}



static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm)

{

	struct snd_pcm_substream *substream;

	struct snd_dma_buffer *buf;

	int stream;



	for (stream = 0; stream < 2; stream++) {

		substream = pcm->streams[stream].substream;

		if (!substream)

			continue;



		buf = &substream->dma_buffer;

		if (!buf->area)

			continue;

		dma_free_coherent(NULL, buf->bytes, buf->area, 0);

		buf->area = NULL;

	}

}



static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);



static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_pcm *pcm = rtd->pcm;

	int ret = 0;

	size_t size = bf5xx_pcm_hardware.buffer_bytes_max;



	pr_debug("%s enter\n", __func__);

	if (!card->dev->dma_mask)
@@ -265,27 +222,13 @@ static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd) 
	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_PLAYBACK);

		if (ret)

			goto out;

	}



	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		ret = bf5xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_CAPTURE);

		if (ret)

			goto out;

	}

 out:

	return ret;

	return snd_pcm_lib_preallocate_pages_for_all(rtd->pcm,

				SNDRV_DMA_TYPE_DEV, card->dev, size, size);

}



static struct snd_soc_platform_driver bf5xx_i2s_soc_platform = {

	.ops		= &bf5xx_pcm_i2s_ops,

	.pcm_new	= bf5xx_pcm_i2s_new,

	.pcm_free	= bf5xx_pcm_free_dma_buffers,

};



static int bfin_i2s_soc_platform_probe(struct platform_device *pdev)