diff options
| author | Peter Ujfalusi <peter.ujfalusi@linux.intel.com> | 2021-12-23 13:36:18 +0200 | 
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-12-23 13:38:18 +0000 | 
| commit | d41607d37c1385da799f9a2ddb10c460e573687e (patch) | |
| tree | 346addf4c174f1ddcf5b3b7a3b09ab736e9eb825 | |
| parent | fc179420fde3821c4d191e81b4f7b05c1dab87e2 (diff) | |
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>
| -rw-r--r-- | include/sound/sof.h | 4 | ||||
| -rw-r--r-- | sound/soc/sof/debug.c | 2 | ||||
| -rw-r--r-- | sound/soc/sof/sof-priv.h | 4 | 
3 files changed, 5 insertions, 5 deletions
| diff --git a/include/sound/sof.h b/include/sound/sof.h index b9131c01eefd..813680ab9aad 100644 --- 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 75aaf0da87a0..d3640ff33134 100644 --- 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 a1ebc89b216a..44ae8d8d1333 100644 --- 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; | 
