Commit e485e538 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: maestro3: Use managed buffer allocation 

Clean up the driver with the new managed buffer allocation API.
The superfluous snd_pcm_lib_malloc_pages() and
snd_pcm_lib_free_pages() calls are dropped.

Link: https://lore.kernel.org/r/20191209094943.14984-47-tiwai@suse.de


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

sound/pci/maestro3.c

+2 −7
Original line number Diff line number Diff line
@@ -1381,10 +1381,7 @@ static int snd_m3_pcm_hw_params(struct snd_pcm_substream *substream, 
				struct snd_pcm_hw_params *hw_params)

{

	struct m3_dma *s = substream->runtime->private_data;

	int err;



	if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)

		return err;

	/* set buffer address */

	s->buffer_addr = substream->runtime->dma_addr;

	if (s->buffer_addr & 0x3) {
@@ -1401,7 +1398,6 @@ static int snd_m3_pcm_hw_free(struct snd_pcm_substream *substream) 
	if (substream->runtime->private_data == NULL)

		return 0;

	s = substream->runtime->private_data;

	snd_pcm_lib_free_pages(substream);

	s->buffer_addr = 0;

	return 0;

}
@@ -1860,9 +1856,8 @@ snd_m3_pcm(struct snd_m3 * chip, int device) 
	strcpy(pcm->name, chip->card->driver);

	chip->pcm = pcm;

	

	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

					      &chip->pci->dev,

					      64*1024, 64*1024);

	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,

				       &chip->pci->dev, 64*1024, 64*1024);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE