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>

diff --git a/include/sound/sof.h b/include/sound/sof.h
index b9131c01eefd54297a140f76a7c4a20120e1fd0c..813680ab9aad4c09db1a44420ef45fd926c7f389 100644 (file)
--- a/include/sound/sof.h
+++ b/include/sound/sof.h
@@ -18,7 +18,7 @@
 struct snd_sof_dsp_ops;
 
 /**
- * enum snd_sof_fw_state - DSP firmware state definitions
+ * enum sof_fw_state - DSP firmware state definitions
  * @SOF_FW_BOOT_NOT_STARTED:   firmware boot is not yet started
  * @SOF_FW_BOOT_PREPARE:       preparing for boot (firmware loading for exaqmple)
  * @SOF_FW_BOOT_IN_PROGRESS:   firmware boot is in progress
@@ -28,7 +28,7 @@ struct snd_sof_dsp_ops;
  * @SOF_FW_BOOT_COMPLETE:      firmware is booted up and functional
  * @SOF_FW_CRASHED:            firmware crashed after successful boot
  */
-enum snd_sof_fw_state {
+enum sof_fw_state {
        SOF_FW_BOOT_NOT_STARTED = 0,
        SOF_FW_BOOT_PREPARE,
        SOF_FW_BOOT_IN_PROGRESS,

diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
index 75aaf0da87a07488ec247e5b7527834dd3edd671..d3640ff33134bec53bfc70cbccf7a876390069a8 100644 (file)
--- a/sound/soc/sof/debug.c
+++ b/sound/soc/sof/debug.c
@@ -930,7 +930,7 @@ void snd_sof_free_debug(struct snd_sof_dev *sdev)
 EXPORT_SYMBOL_GPL(snd_sof_free_debug);
 
 static const struct soc_fw_state_info {
-       enum snd_sof_fw_state state;
+       enum sof_fw_state state;
        const char *name;
 } fw_state_dbg[] = {
        {SOF_FW_BOOT_NOT_STARTED, "SOF_FW_BOOT_NOT_STARTED"},

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index a1ebc89b216a772853fad2aea120afc155c2f160..44ae8d8d13335bf2be418ff13ff31585eaff3f45 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -399,7 +399,7 @@ struct snd_sof_dev {
 
        /* DSP firmware boot */
        wait_queue_head_t boot_wait;
-       enum snd_sof_fw_state fw_state;
+       enum sof_fw_state fw_state;
        bool first_boot;
 
        /* work queue in case the probe is implemented in two steps */
@@ -591,7 +591,7 @@ extern const struct dsp_arch_ops sof_xtensa_arch_ops;
  * Firmware state tracking
  */
 static inline void sof_set_fw_state(struct snd_sof_dev *sdev,
-                                   enum snd_sof_fw_state new_state)
+                                   enum sof_fw_state new_state)
 {
        if (sdev->fw_state == new_state)
                return;