Unverified Commit d41607d3 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

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: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarPaul Olaru <paul.olaru@oss.nxp.com>
Link: https://lore.kernel.org/r/20211223113628.18582-11-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fc179420

include/sound/sof.h

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

sound/soc/sof/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -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"},

sound/soc/sof/sof-priv.h

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