ASoC: SOF: Intel: HDA: use IPC version-specific ops
authorRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Thu, 22 Sep 2022 21:36:42 +0000 (14:36 -0700)
committerMark Brown <broonie@kernel.org>
Fri, 23 Sep 2022 12:56:19 +0000 (13:56 +0100)
Use the IP-specific ops for disabling interrupts and powering down the
DSP in hda_suspend.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220922213644.666315-9-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/hda-dsp.c

index 2ab2200..3c76f84 100644 (file)
@@ -629,10 +629,9 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend)
            sdev->fw_state == SOF_FW_BOOT_FAILED)
                hda->skip_imr_boot = true;
 
-       hda_sdw_int_enable(sdev, false);
-
-       /* disable IPC interrupts */
-       hda_dsp_ipc_int_disable(sdev);
+       ret = chip->disable_interrupts(sdev);
+       if (ret < 0)
+               return ret;
 
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
        hda_codec_jack_wake_enable(sdev, runtime_suspend);
@@ -641,11 +640,9 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend)
        snd_hdac_ext_bus_link_power_down_all(bus);
 #endif
 
-       /* power down DSP */
-       ret = hda_dsp_core_reset_power_down(sdev, chip->host_managed_cores_mask);
+       ret = chip->power_down_dsp(sdev);
        if (ret < 0) {
-               dev_err(sdev->dev,
-                       "error: failed to power down core during suspend\n");
+               dev_err(sdev->dev, "failed to power down DSP during suspend\n");
                return ret;
        }