ALSA: vx: Use managed buffer allocation (8f326303) · Commits · 戴 / test

sound/drivers/vx/vx_pcm.c

+3 −24

Original line number	Diff line number	Diff line
		@@ -772,23 +772,6 @@ static snd_pcm_uframes_t vx_pcm_playback_pointer(struct snd_pcm_substream *subs)
		return pipe->position;
		}

		/*
		* vx_pcm_hw_params - hw_params callback for playback and capture
		*/
		static int vx_pcm_hw_params(struct snd_pcm_substream *subs,
		struct snd_pcm_hw_params *hw_params)
		{
		return snd_pcm_lib_malloc_pages(subs, params_buffer_bytes(hw_params));
		}

		/*
		* vx_pcm_hw_free - hw_free callback for playback and capture
		*/
		static int vx_pcm_hw_free(struct snd_pcm_substream *subs)
		{
		return snd_pcm_lib_free_pages(subs);
		}

		/*
		* vx_pcm_prepare - prepare callback for playback and capture
		*/
		@@ -861,8 +844,6 @@ static const struct snd_pcm_ops vx_pcm_playback_ops = {
		.open = vx_pcm_playback_open,
		.close = vx_pcm_playback_close,
		.ioctl = snd_pcm_lib_ioctl,
		.hw_params = vx_pcm_hw_params,
		.hw_free = vx_pcm_hw_free,
		.prepare = vx_pcm_prepare,
		.trigger = vx_pcm_trigger,
		.pointer = vx_pcm_playback_pointer,
		@@ -1081,8 +1062,6 @@ static const struct snd_pcm_ops vx_pcm_capture_ops = {
		.open = vx_pcm_capture_open,
		.close = vx_pcm_capture_close,
		.ioctl = snd_pcm_lib_ioctl,
		.hw_params = vx_pcm_hw_params,
		.hw_free = vx_pcm_hw_free,
		.prepare = vx_pcm_prepare,
		.trigger = vx_pcm_trigger,
		.pointer = vx_pcm_capture_pointer,
		@@ -1230,7 +1209,7 @@ int snd_vx_pcm_new(struct vx_core *chip)
		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &vx_pcm_playback_ops);
		if (ins)
		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &vx_pcm_capture_ops);
		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_VMALLOC,
		snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC,
		snd_dma_continuous_data(GFP_KERNEL \| GFP_DMA32),
		0, 0);

Admin message