diff options
| author | Ranjani Sridharan <ranjani.sridharan@linux.intel.com> | 2020-02-28 15:42:25 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-02 14:31:43 +0000 |
| commit | 787c5214ea6f6e9b7c75ae670d6b6a7deecb2d45 (patch) | |
| tree | 341a239d77cdc90203b1e091304da37060f6b063 /sound/soc/sof | |
| parent | a57ec83a7104eab6f08215702067fbcbef90c0a0 (diff) | |
| download | linux-stable-787c5214ea6f6e9b7c75ae670d6b6a7deecb2d45.tar.gz linux-stable-787c5214ea6f6e9b7c75ae670d6b6a7deecb2d45.tar.bz2 linux-stable-787c5214ea6f6e9b7c75ae670d6b6a7deecb2d45.zip | |
ASoC: SOF: Intel: hda: use snd_sof_dsp_set_power_state() op
Replace the calls to hda_dsp_set_power_state() with the
top-level SOF op snd_sof_set_power_state().
Along with this, modify the hda_dsp_resume() function to return
the value of snd_sof_set_power_state() directly.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Jaska Uimonen <jaska.uimonen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200228234225.6963-1-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/intel/hda-dsp.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 0e61c27785a3..79ce52c32ef1 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -662,7 +662,7 @@ int hda_dsp_resume(struct snd_sof_dev *sdev) hda_codec_i915_display_power(sdev, true); /* Set DSP power state */ - ret = hda_dsp_set_power_state(sdev, &target_state); + ret = snd_sof_dsp_set_power_state(sdev, &target_state); if (ret < 0) { dev_err(sdev->dev, "error: setting dsp state %d substate %d\n", target_state.state, target_state.substate); @@ -686,8 +686,7 @@ int hda_dsp_resume(struct snd_sof_dev *sdev) if (ret < 0) return ret; - hda_dsp_set_power_state(sdev, &target_state); - return ret; + return snd_sof_dsp_set_power_state(sdev, &target_state); } int hda_dsp_runtime_resume(struct snd_sof_dev *sdev) @@ -702,7 +701,7 @@ int hda_dsp_runtime_resume(struct snd_sof_dev *sdev) if (ret < 0) return ret; - return hda_dsp_set_power_state(sdev, &target_state); + return snd_sof_dsp_set_power_state(sdev, &target_state); } int hda_dsp_runtime_idle(struct snd_sof_dev *sdev) @@ -730,7 +729,7 @@ int hda_dsp_runtime_suspend(struct snd_sof_dev *sdev) if (ret < 0) return ret; - return hda_dsp_set_power_state(sdev, &target_state); + return snd_sof_dsp_set_power_state(sdev, &target_state); } int hda_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state) @@ -753,7 +752,7 @@ int hda_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state) hda_codec_i915_display_power(sdev, false); /* Set DSP power state */ - ret = hda_dsp_set_power_state(sdev, &target_dsp_state); + ret = snd_sof_dsp_set_power_state(sdev, &target_dsp_state); if (ret < 0) { dev_err(sdev->dev, "error: setting dsp state %d substate %d\n", target_dsp_state.state, @@ -781,7 +780,7 @@ int hda_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state) return ret; } - return hda_dsp_set_power_state(sdev, &target_dsp_state); + return snd_sof_dsp_set_power_state(sdev, &target_dsp_state); } int hda_dsp_set_hw_params_upon_resume(struct snd_sof_dev *sdev) @@ -849,7 +848,7 @@ void hda_dsp_d0i3_work(struct work_struct *work) return; /* This can fail but error cannot be propagated */ - ret = hda_dsp_set_power_state(sdev, &target_state); + ret = snd_sof_dsp_set_power_state(sdev, &target_state); if (ret < 0) dev_err_ratelimited(sdev->dev, "error: failed to set DSP state %d substate %d\n", |