Commit 1a486032 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ASoC: Remove superfluous snd_dma_continuous_data() 



The recent change (commit 08422d2c: "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: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20191108094641.20086-2-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2406ff9b

sound/soc/au1x/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

sound/soc/dwc/dwc-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

sound/soc/sh/dma-sh7760.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE