media: solo6x10: Remove superfluous snd_dma_continuous_data() (ef99d99b) · Commits · 戴 / test

The recent change (commit : "ALSA: memalloc: Allow NULL device for SNDRV_DMA_TYPE_CONTINOUS type") made the PCM preallocation helper accepting NULL as the device pointer for the default usage. Drop the snd_dma_continuous_data() usage that became superfluous from the callers. Acked-by:

Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by:

Takashi Iwai <tiwai@suse.de>

drivers/media/pci/solo6x10/solo6x10-g723.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)

		snd_pcm_lib_preallocate_pages_for_all(pcm,
		SNDRV_DMA_TYPE_CONTINUOUS,
		snd_dma_continuous_data(GFP_KERNEL),
		NULL,
		G723_PERIOD_BYTES * PERIODS,
		G723_PERIOD_BYTES * PERIODS);

drivers/media/usb/usbtv/usbtv-audio.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -378,8 +378,7 @@ int usbtv_audio_init(struct usbtv *usbtv)

		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usbtv_pcm_ops);
		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
		snd_dma_continuous_data(GFP_KERNEL), USBTV_AUDIO_BUFFER,
		USBTV_AUDIO_BUFFER);
		NULL, USBTV_AUDIO_BUFFER, USBTV_AUDIO_BUFFER);

		rv = snd_card_register(card);
		if (rv)

Admin message