Subject: linux-next: manual merge of the sound tree with the sound-asoc-fixes tree

From: Mark Brown <[email-masked]>
Date: Wed, 26 Jun 2024 17:59:40 +0100

Hi all,

Today's linux-next merge of the sound tree got a conflict in:

  sound/core/pcm_dmaengine.c

between commit:

  e8343410ddf08 ("ALSA: dmaengine: Synchronize dma channel after drop()")

from the sound-asoc-fixes tree and commit:

  6a7db25aad8ce ("ALSA: dmaengine_pcm: terminate dmaengine before synchronize")

from the sound tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc sound/core/pcm_dmaengine.c
index cc5db93b9132c,4f18511f1c92e..0000000000000
--- a/sound/core/pcm_dmaengine.c
+++ b/sound/core/pcm_dmaengine.c
@@@ -349,23 -349,8 +349,18 @@@ int snd_dmaengine_pcm_open_request_chan
  }
  EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan);
  
 +int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream)
 +{
 +	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
 +
 +	dmaengine_synchronize(prtd->dma_chan);
 +
 +	return 0;
 +}
 +EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_sync_stop);
 +
- /**
-  * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream
-  * @substream: PCM substream
-  *
-  * Return: 0 on success, a negative error code otherwise
-  */
- int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream)
+ static void __snd_dmaengine_pcm_close(struct snd_pcm_substream *substream,
+ 				      bool release_channel)
  {
  	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
  	struct dma_tx_state state;