Skip to content

Commit

Permalink
media: solo6x10: Remove superfluous snd_dma_continuous_data()
Browse files Browse the repository at this point in the history
The recent change (commit 08422d2: "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>
  • Loading branch information
Takashi Iwai committed Nov 11, 2019
1 parent 9cb7831 commit ef99d99
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/media/pci/solo6x10/solo6x10-g723.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 1 addition & 2 deletions drivers/media/usb/usbtv/usbtv-audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit ef99d99

Please sign in to comment.