Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: SOF: Rename 'enum snd_sof_fw_state' to 'enum sof_fw_state'

Since there is nothing SND about the firmware state, rename the enum
from `snd_sof_fw_state` to simply `sof_fw_state`

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Paul Olaru <paul.olaru@oss.nxp.com>
Link: https://lore.kernel.org/r/20211223113628.18582-11-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Peter Ujfalusi and committed by
Mark Brown
d41607d3 fc179420

+5 -5
+2 -2
include/sound/sof.h
··· 18 18 struct snd_sof_dsp_ops; 19 19 20 20 /** 21 - * enum snd_sof_fw_state - DSP firmware state definitions 21 + * enum sof_fw_state - DSP firmware state definitions 22 22 * @SOF_FW_BOOT_NOT_STARTED: firmware boot is not yet started 23 23 * @SOF_FW_BOOT_PREPARE: preparing for boot (firmware loading for exaqmple) 24 24 * @SOF_FW_BOOT_IN_PROGRESS: firmware boot is in progress ··· 28 28 * @SOF_FW_BOOT_COMPLETE: firmware is booted up and functional 29 29 * @SOF_FW_CRASHED: firmware crashed after successful boot 30 30 */ 31 - enum snd_sof_fw_state { 31 + enum sof_fw_state { 32 32 SOF_FW_BOOT_NOT_STARTED = 0, 33 33 SOF_FW_BOOT_PREPARE, 34 34 SOF_FW_BOOT_IN_PROGRESS,
+1 -1
sound/soc/sof/debug.c
··· 930 930 EXPORT_SYMBOL_GPL(snd_sof_free_debug); 931 931 932 932 static const struct soc_fw_state_info { 933 - enum snd_sof_fw_state state; 933 + enum sof_fw_state state; 934 934 const char *name; 935 935 } fw_state_dbg[] = { 936 936 {SOF_FW_BOOT_NOT_STARTED, "SOF_FW_BOOT_NOT_STARTED"},
+2 -2
sound/soc/sof/sof-priv.h
··· 399 399 400 400 /* DSP firmware boot */ 401 401 wait_queue_head_t boot_wait; 402 - enum snd_sof_fw_state fw_state; 402 + enum sof_fw_state fw_state; 403 403 bool first_boot; 404 404 405 405 /* work queue in case the probe is implemented in two steps */ ··· 591 591 * Firmware state tracking 592 592 */ 593 593 static inline void sof_set_fw_state(struct snd_sof_dev *sdev, 594 - enum snd_sof_fw_state new_state) 594 + enum sof_fw_state new_state) 595 595 { 596 596 if (sdev->fw_state == new_state) 597 597 return;