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

ASoC: SOF: HDA: (cosmetic) simplify hda_dsp_d0i3_work()

Simplify hda_dsp_d0i3_work() by returning immediately from it
if D0i3 cannot be set.

Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Libin Yang <libin.yang@intel.com>
Reviewed-by: Keyon Jie <yang.jie@intel.com>
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210208232149.58899-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Guennadi Liakhovetski and committed by
Mark Brown
f1bb0235 3be46fa2

+6 -10
+6 -10
sound/soc/sof/intel/hda-dsp.c
··· 934 934 d0i3_work.work); 935 935 struct hdac_bus *bus = &hdev->hbus.core; 936 936 struct snd_sof_dev *sdev = dev_get_drvdata(bus->dev); 937 - struct sof_dsp_power_state target_state; 937 + struct sof_dsp_power_state target_state = { 938 + .state = SOF_DSP_PM_D0, 939 + .substate = SOF_HDA_DSP_PM_D0I3, 940 + }; 938 941 int ret; 939 942 940 - target_state.state = SOF_DSP_PM_D0; 941 - 942 943 /* DSP can enter D0I3 iff only D0I3-compatible streams are active */ 943 - if (snd_sof_dsp_only_d0i3_compatible_stream_active(sdev)) 944 - target_state.substate = SOF_HDA_DSP_PM_D0I3; 945 - else 946 - target_state.substate = SOF_HDA_DSP_PM_D0I0; 947 - 948 - /* remain in D0I0 */ 949 - if (target_state.substate == SOF_HDA_DSP_PM_D0I0) 944 + if (!snd_sof_dsp_only_d0i3_compatible_stream_active(sdev)) 945 + /* remain in D0I0 */ 950 946 return; 951 947 952 948 /* This can fail but error cannot be propagated */