| Message ID | 20220617120133.4011846-1-s.hauer@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 289a3ec0b5b9a2de6fc75633aa81f017792ecc99 |
| Headers | show |
| Series | ASoC: fsl_asrc_dma: Use dmaengine_terminate_async() | expand |
On Fri, 17 Jun 2022 14:01:33 +0200, Sascha Hauer wrote: > dmaengine_terminate_all() is deprecated and should no longer be used. > Use dmaengine_terminate_async() instead. This involves no functional change > since both functions do the same. > After dmaengine_terminate_async() dmaengine_synchronize() must be called > to make sure the channel has really stopped before the underlying memory > is freed. This is done implicitly by dma_release_channel() called from > the .hw_free hook. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: fsl_asrc_dma: Use dmaengine_terminate_async() commit: 289a3ec0b5b9a2de6fc75633aa81f017792ecc99 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c index fec56dbb64e60..6c4d161ddad85 100644 --- a/sound/soc/fsl/fsl_asrc_dma.c +++ b/sound/soc/fsl/fsl_asrc_dma.c @@ -114,8 +114,8 @@ static int fsl_asrc_dma_trigger(struct snd_soc_component *component, case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - dmaengine_terminate_all(pair->dma_chan[OUT]); - dmaengine_terminate_all(pair->dma_chan[IN]); + dmaengine_terminate_async(pair->dma_chan[OUT]); + dmaengine_terminate_async(pair->dma_chan[IN]); break; default: return -EINVAL;
dmaengine_terminate_all() is deprecated and should no longer be used. Use dmaengine_terminate_async() instead. This involves no functional change since both functions do the same. After dmaengine_terminate_async() dmaengine_synchronize() must be called to make sure the channel has really stopped before the underlying memory is freed. This is done implicitly by dma_release_channel() called from the .hw_free hook. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- sound/soc/fsl/fsl_asrc_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)