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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 20 Oct 2023 12:26:29 +1100

Hi all,

Today's linux-next merge of the sound-asoc tree got conflicts in:

  sound/soc/sof/intel/hda.h
  sound/soc/sof/sof-priv.h

between commits:

  17baaa1f950b ("ASoC: SOF: core: Add probe_early and remove_late callbacks")
  3d1a05581361 ("ASoC: SOF: Intel: Move binding to display driver outside of deferred probe")

from the sound tree and commit:

  e4d09de3919b ("ASoC: SOF: make .remove callback return void")

from the sound-asoc 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.

-- 
Cheers,
Stephen Rothwell

diff --cc sound/soc/sof/intel/hda.h
index 8e846684279e,0ebc042c5ce1..000000000000
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@@ -573,10 -576,8 +576,10 @@@ struct sof_intel_hda_stream 
  /*
   * DSP Core services.
   */
 +int hda_dsp_probe_early(struct snd_sof_dev *sdev);
  int hda_dsp_probe(struct snd_sof_dev *sdev);
- int hda_dsp_remove(struct snd_sof_dev *sdev);
+ void hda_dsp_remove(struct snd_sof_dev *sdev);
 +int hda_dsp_remove_late(struct snd_sof_dev *sdev);
  int hda_dsp_core_power_up(struct snd_sof_dev *sdev, unsigned int core_mask);
  int hda_dsp_core_run(struct snd_sof_dev *sdev, unsigned int core_mask);
  int hda_dsp_enable_core(struct snd_sof_dev *sdev, unsigned int core_mask);
diff --cc sound/soc/sof/sof-priv.h
index e73a92189fe1,40bca5f80428..000000000000
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@@ -165,10 -165,8 +165,10 @@@ struct sof_firmware 
  struct snd_sof_dsp_ops {
  
  	/* probe/remove/shutdown */
 +	int (*probe_early)(struct snd_sof_dev *sof_dev); /* optional */
  	int (*probe)(struct snd_sof_dev *sof_dev); /* mandatory */
- 	int (*remove)(struct snd_sof_dev *sof_dev); /* optional */
+ 	void (*remove)(struct snd_sof_dev *sof_dev); /* optional */
 +	int (*remove_late)(struct snd_sof_dev *sof_dev); /* optional */
  	int (*shutdown)(struct snd_sof_dev *sof_dev); /* optional */
  
  	/* DSP core boot / reset */