media: solo6x10: Remove superfluous snd_dma_continuous_data()
authorTakashi Iwai <tiwai@suse.de>
Mon, 4 Nov 2019 13:33:58 +0000 (14:33 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 11 Nov 2019 08:13:51 +0000 (09:13 +0100)
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 <hverkuil-cisco@xs4all.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
drivers/media/pci/solo6x10/solo6x10-g723.c
drivers/media/usb/usbtv/usbtv-audio.c

index 30c8f2ec9c3cca269d82e48e94899190cc14ef1e..eaa57d835ea8f31b9a21b094a15add942f83f406 100644 (file)
@@ -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);
 
index 6f108996142d742b4c8ec3ba99368c97ce8f1373..e746c8ddfc499700345e507dbf87792db7113bde 100644 (file)
@@ -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)