ALSA: sh: Use managed buffer allocation (50cdf3a0) · Commits · 戴 / test

sound/sh/sh_dac_audio.c

+2 −18

Original line number	Diff line number	Diff line
		@@ -125,18 +125,6 @@ static int snd_sh_dac_pcm_close(struct snd_pcm_substream *substream)
		return 0;
		}

		static int snd_sh_dac_pcm_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *hw_params)
		{
		return snd_pcm_lib_malloc_pages(substream,
		params_buffer_bytes(hw_params));
		}

		static int snd_sh_dac_pcm_hw_free(struct snd_pcm_substream *substream)
		{
		return snd_pcm_lib_free_pages(substream);
		}

		static int snd_sh_dac_pcm_prepare(struct snd_pcm_substream *substream)
		{
		struct snd_sh_dac *chip = snd_pcm_substream_chip(substream);
		@@ -241,8 +229,6 @@ static const struct snd_pcm_ops snd_sh_dac_pcm_ops = {
		.open = snd_sh_dac_pcm_open,
		.close = snd_sh_dac_pcm_close,
		.ioctl = snd_pcm_lib_ioctl,
		.hw_params = snd_sh_dac_pcm_hw_params,
		.hw_free = snd_sh_dac_pcm_hw_free,
		.prepare = snd_sh_dac_pcm_prepare,
		.trigger = snd_sh_dac_pcm_trigger,
		.pointer = snd_sh_dac_pcm_pointer,
		@@ -267,10 +253,8 @@ static int snd_sh_dac_pcm(struct snd_sh_dac *chip, int device)
		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sh_dac_pcm_ops);

		/* buffer size=48K */
		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
		NULL,
		48 * 1024,
		48 * 1024);
		snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
		NULL, 48 * 1024, 48 * 1024);

		return 0;
		}