From: Takashi Iwai Date: Mon, 4 Nov 2019 13:33:58 +0000 (+0100) Subject: media: solo6x10: Remove superfluous snd_dma_continuous_data() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ef99d99b2fd921148dc15e706f2fb071ba3fee6c;p=linux.git media: solo6x10: Remove superfluous snd_dma_continuous_data() The recent change (commit 08422d2c559d: "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 Signed-off-by: Takashi Iwai --- diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c index 30c8f2ec9c3cc..eaa57d835ea8f 100644 --- a/drivers/media/pci/solo6x10/solo6x10-g723.c +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c @@ -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); diff --git a/drivers/media/usb/usbtv/usbtv-audio.c b/drivers/media/usb/usbtv/usbtv-audio.c index 6f108996142d7..e746c8ddfc499 100644 --- a/drivers/media/usb/usbtv/usbtv-audio.c +++ b/drivers/media/usb/usbtv/usbtv-audio.c @@ -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)