ASoC: SOF: core: Move probe work related code under a single if () branch
Relocate the INIT_WORK() at the same place where we schedule the work to make the code simpler and easier to follow. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20210916124902.24248-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
bde4f08cff
commit
3b4a673fa4
|
@ -325,9 +325,6 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data)
|
|||
spin_lock_init(&sdev->hw_lock);
|
||||
mutex_init(&sdev->power_state_access);
|
||||
|
||||
if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE))
|
||||
INIT_WORK(&sdev->probe_work, sof_probe_work);
|
||||
|
||||
/* set default timeouts if none provided */
|
||||
if (plat_data->desc->ipc_timeout == 0)
|
||||
sdev->ipc_timeout = TIMEOUT_DEFAULT_IPC_MS;
|
||||
|
@ -339,6 +336,7 @@ int snd_sof_device_probe(struct device *dev, struct snd_sof_pdata *plat_data)
|
|||
sdev->boot_timeout = plat_data->desc->boot_timeout;
|
||||
|
||||
if (IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE)) {
|
||||
INIT_WORK(&sdev->probe_work, sof_probe_work);
|
||||
schedule_work(&sdev->probe_work);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue