| Message ID | 20191108163649.32590-2-tiwai@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: ALSA memalloc cleanups | expand |
On 11/8/19 5:36 PM, Takashi Iwai wrote: > 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. > > Signed-off-by: Takashi Iwai <tiwai@suse.de> Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Thanks! Hans > --- > drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +- > drivers/media/usb/usbtv/usbtv-audio.c | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c > index 30c8f2ec9c3c..eaa57d835ea8 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 6f108996142d..e746c8ddfc49 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) >
diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c index 30c8f2ec9c3c..eaa57d835ea8 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 6f108996142d..e746c8ddfc49 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)
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. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +- drivers/media/usb/usbtv/usbtv-audio.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)