github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 06:31:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: SOF: Make return of remove_late void, too

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

Fixes: 17baaa1f95 ("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>
This commit is contained in:
Takashi Iwai 2023-10-23 17:36:05 +02:00
parent 41a3056e4e
commit 264aeb994e
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/sof/intel/hda.c
View File

@ -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)

2
sound/soc/sof/intel/hda.h
View File

@ -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);

6
sound/soc/sof/ops.h
View File

@ -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)

2
sound/soc/sof/sof-priv.h
View File

@ -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 */