diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-11-08 10:46:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-11-09 18:02:52 +0100 |
| commit | 1a4860325cc740b4ec4b849f31fa694cf8870569 (patch) | |
| tree | 24da8d23c985c18795e77c26166952aa0b25f8b3 /sound | |
| parent | ALSA: pcm: Yet another missing check of non-cached buffer type (diff) | |
| download | linux-1a4860325cc740b4ec4b849f31fa694cf8870569.tar.xz linux-1a4860325cc740b4ec4b849f31fa694cf8870569.zip | |
ASoC: 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: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20191108094641.20086-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/au1x/dma.c | 2 | ||||
| -rw-r--r-- | sound/soc/dwc/dwc-pcm.c | 2 | ||||
| -rw-r--r-- | sound/soc/sh/dma-sh7760.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/au1x/dma.c b/sound/soc/au1x/dma.c index 49556eb409cd..054dfda89d3e 100644 --- a/sound/soc/au1x/dma.c +++ b/sound/soc/au1x/dma.c @@ -293,7 +293,7 @@ static int alchemy_pcm_new(struct snd_soc_component *component, struct snd_pcm *pcm = rtd->pcm; snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, - snd_dma_continuous_data(GFP_KERNEL), 65536, (4096 * 1024) - 1); + NULL, 65536, (4096 * 1024) - 1); return 0; } diff --git a/sound/soc/dwc/dwc-pcm.c b/sound/soc/dwc/dwc-pcm.c index de6fcc808832..4771eb5fbe2a 100644 --- a/sound/soc/dwc/dwc-pcm.c +++ b/sound/soc/dwc/dwc-pcm.c @@ -258,7 +258,7 @@ static int dw_pcm_new(struct snd_soc_component *component, snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_CONTINUOUS, - snd_dma_continuous_data(GFP_KERNEL), size, size); + NULL, size, size); return 0; } diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c index 93bb80d089be..2b0eca02a8b9 100644 --- a/sound/soc/sh/dma-sh7760.c +++ b/sound/soc/sh/dma-sh7760.c @@ -309,7 +309,7 @@ static int camelot_pcm_new(struct snd_soc_component *component, */ snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, - snd_dma_continuous_data(GFP_KERNEL), + NULL, DMABRG_PREALLOC_BUFFER, DMABRG_PREALLOC_BUFFER_MAX); return 0; |