ASoC: SOF: Make return of remove_late void, too

Like the change we've done for remove callback, the newly introduced
remove_late callback should be changed to void return, too.

Fixes: 17baaa1f950b ("ASoC: SOF: core: Add probe_early and remove_late callbacks")
Acked-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20231023153605.863-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 8342fcf52f52f145075e31bedec67ed1d705a9f4..744c0dd5766d012c343a54f27e58c980bbc13631 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1382,13 +1382,11 @@ skip_disable_dsp:
                iounmap(sdev->bar[HDA_DSP_BAR]);
 }
 
-int hda_dsp_remove_late(struct snd_sof_dev *sdev)
+void 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)

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index f57a9a4b0b753c0650615105e0a6256d1147b5a7..d628d6a3a7e5a1cf3265b50917297bcbda9a0ad2 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -579,7 +579,7 @@ struct sof_intel_hda_stream {
 int hda_dsp_probe_early(struct snd_sof_dev *sdev);
 int hda_dsp_probe(struct snd_sof_dev *sdev);
 void hda_dsp_remove(struct snd_sof_dev *sdev);
-int hda_dsp_remove_late(struct snd_sof_dev *sdev);
+void 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 --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h
index 09d1452e3705277d1e2d8b83dfea64bb2f8a6330..6538d9f4fe96e02ca2fc45b55deb8738f505787e 100644 (file)
--- a/sound/soc/sof/ops.h
+++ b/sound/soc/sof/ops.h
@@ -57,12 +57,10 @@ static inline void snd_sof_remove(struct snd_sof_dev *sdev)
                sof_ops(sdev)->remove(sdev);
 }
 
-static inline int snd_sof_remove_late(struct snd_sof_dev *sdev)
+static inline void snd_sof_remove_late(struct snd_sof_dev *sdev)
 {
        if (sof_ops(sdev)->remove_late)
-               return sof_ops(sdev)->remove_late(sdev);
-
-       return 0;
+               sof_ops(sdev)->remove_late(sdev);
 }
 
 static inline int snd_sof_shutdown(struct snd_sof_dev *sdev)

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index f712bd39d13d16792676b03a733a5276117c0ff2..f4185012eb69567399299f4c028860de81103e02 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -168,7 +168,7 @@ struct snd_sof_dsp_ops {
        int (*probe_early)(struct snd_sof_dev *sof_dev); /* optional */
        int (*probe)(struct snd_sof_dev *sof_dev); /* mandatory */
        void (*remove)(struct snd_sof_dev *sof_dev); /* optional */
-       int (*remove_late)(struct snd_sof_dev *sof_dev); /* optional */
+       void (*remove_late)(struct snd_sof_dev *sof_dev); /* optional */
        int (*shutdown)(struct snd_sof_dev *sof_dev); /* optional */
 
        /* DSP core boot / reset */