Commit 264aeb99 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: 17baaa1f ("ASoC: SOF: core: Add probe_early and remove_late callbacks")
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20231023153605.863-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 41a3056e

sound/soc/sof/intel/hda.c

+1 −3
Original line number Diff line number Diff line
@@ -1382,13 +1382,11 @@ void hda_dsp_remove(struct snd_sof_dev *sdev) 
		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)

sound/soc/sof/intel/hda.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/sof/ops.h

+2 −4
Original line number Diff line number Diff line
@@ -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)

sound/soc/sof/sof-priv.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */