linux-next: build failure after merge of the sound-asoc tree

[Stephen Rothwell]

Hi all,

After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

sound/soc/sof/intel/hda.c: In function 'hda_dsp_remove':
sound/soc/sof/intel/hda.c:1384:16: error: 'return' with a value, in function returning void [-Werror=return-type]
 1384 |         return 0;
      |                ^
sound/soc/sof/intel/hda.c:1330:6: note: declared here
 1330 | void hda_dsp_remove(struct snd_sof_dev *sdev)
      |      ^~~~~~~~~~~~~~
sound/soc/sof/intel/hda.c: In function 'hda_dsp_remove_late':
sound/soc/sof/intel/hda.c:1392:1: error: control reaches end of non-void function [-Werror=return-type]
 1392 | }
      | ^
cc1: all warnings being treated as errors

Caused by a bad automatic merge between commit

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

and commit

  3d1a05581361 ("ASoC: SOF: Intel: Move binding to display driver outside of deferred probe")

from the sound tree.

I have applied the follwoing merge fix patch.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 20 Oct 2023 12:37:26 +1100
Subject: [PATCH] fix for bad merge of "ASoC: SOF: Intel: Move binding to
 display driver outside of deferred probe"

with "ASoC: SOF: make .remove callback return void"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 sound/soc/sof/intel/hda.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 2f12265c472b..8342fcf52f52 100644
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1380,8 +1380,6 @@ void hda_dsp_remove(struct snd_sof_dev *sdev)
 
 	if (!sdev->dspless_mode_selected)
 		iounmap(sdev->bar[HDA_DSP_BAR]);
-
-	return 0;
 }
 
 int hda_dsp_remove_late(struct snd_sof_dev *sdev)
@@ -1389,6 +1387,8 @@ int hda_dsp_remove_late(struct snd_sof_dev *sdev)
 	iounmap(sof_to_bus(sdev)->remap_addr);
 	sof_hda_bus_exit(sdev);
 	hda_codec_i915_exit(sdev);
+
+	return 0;
 }
 
 int hda_power_down_dsp(struct snd_sof_dev *sdev)
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgpD5iy7Z2TM8.pgp
Description: OpenPGP digital signature