ALSA: 6fire: Use managed buffer allocation (a3c10ea4) · Commits · 戴 / test

sound/usb/6fire/pcm.c

+1 −16

Original line number	Diff line number	Diff line
		@@ -446,18 +446,6 @@ static int usb6fire_pcm_close(struct snd_pcm_substream *alsa_sub)
		return 0;
		}

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

		static int usb6fire_pcm_hw_free(struct snd_pcm_substream *alsa_sub)
		{
		return snd_pcm_lib_free_pages(alsa_sub);
		}

		static int usb6fire_pcm_prepare(struct snd_pcm_substream *alsa_sub)
		{
		struct pcm_runtime *rt = snd_pcm_substream_chip(alsa_sub);
		@@ -555,8 +543,6 @@ static const struct snd_pcm_ops pcm_ops = {
		.open = usb6fire_pcm_open,
		.close = usb6fire_pcm_close,
		.ioctl = snd_pcm_lib_ioctl,
		.hw_params = usb6fire_pcm_hw_params,
		.hw_free = usb6fire_pcm_hw_free,
		.prepare = usb6fire_pcm_prepare,
		.trigger = usb6fire_pcm_trigger,
		.pointer = usb6fire_pcm_pointer,
		@@ -658,8 +644,7 @@ int usb6fire_pcm_init(struct sfire_chip *chip)
		strcpy(pcm->name, "DMX 6Fire USB");
		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &pcm_ops);
		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pcm_ops);
		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_VMALLOC,
		NULL, 0, 0);
		snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, NULL, 0, 0);

		rt->instance = pcm;