Commit 801bf057 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: atiixp: Use managed buffer allocation 

Clean up the drivers 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-25-tiwai@suse.de


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

sound/pci/atiixp.c

+4 −10
Original line number Diff line number Diff line
@@ -952,9 +952,6 @@ static int snd_atiixp_pcm_hw_params(struct snd_pcm_substream *substream, 
	struct atiixp_dma *dma = substream->runtime->private_data;

	int err;



	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));

	if (err < 0)

		return err;

	dma->buf_addr = substream->runtime->dma_addr;

	dma->buf_bytes = params_buffer_bytes(hw_params);
@@ -994,7 +991,6 @@ static int snd_atiixp_pcm_hw_free(struct snd_pcm_substream *substream) 
		dma->pcm_open_flag = 0;

	}

	atiixp_clear_dma_packets(chip, dma, substream);

	snd_pcm_lib_free_pages(substream);

	return 0;

}
@@ -1283,9 +1279,8 @@ static int snd_atiixp_pcm_new(struct atiixp *chip) 
	strcpy(pcm->name, "ATI IXP AC97");

	chip->pcmdevs[ATI_PCMDEV_ANALOG] = pcm;



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

					      &chip->pci->dev,

					      64*1024, 128*1024);

	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,

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



	err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,

				     snd_pcm_alt_chmaps, chip->max_channels, 0,
@@ -1316,9 +1311,8 @@ static int snd_atiixp_pcm_new(struct atiixp *chip) 
		strcpy(pcm->name, "ATI IXP IEC958 (Direct)");

	chip->pcmdevs[ATI_PCMDEV_DIGITAL] = pcm;



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

					      &chip->pci->dev,

					      64*1024, 128*1024);

	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,

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



	/* pre-select AC97 SPDIF slots 10/11 */

	for (i = 0; i < NUM_ATI_CODECS; i++) {

sound/pci/atiixp_modem.c

+2 −7
Original line number Diff line number Diff line
@@ -783,9 +783,6 @@ static int snd_atiixp_pcm_hw_params(struct snd_pcm_substream *substream, 
	int err;

	int i;



	err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));

	if (err < 0)

		return err;

	dma->buf_addr = substream->runtime->dma_addr;

	dma->buf_bytes = params_buffer_bytes(hw_params);
@@ -812,7 +809,6 @@ static int snd_atiixp_pcm_hw_free(struct snd_pcm_substream *substream) 
	struct atiixp_dma *dma = substream->runtime->private_data;



	atiixp_clear_dma_packets(chip, dma, substream);

	snd_pcm_lib_free_pages(substream);

	return 0;

}
@@ -994,9 +990,8 @@ static int snd_atiixp_pcm_new(struct atiixp_modem *chip) 
	strcpy(pcm->name, "ATI IXP MC97");

	chip->pcmdevs[ATI_PCMDEV_ANALOG] = pcm;



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

					      &chip->pci->dev,

					      64*1024, 128*1024);

	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,

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



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE