ASoC: SOF: Intel: Use existing helpers to change GPROCEN and PIE bits

Instead of directly changing the GPROCEN/PIE bits in PPCTL we should use
the existing helper hda_dsp_ctrl_ppcap_enable() and
hda_dsp_ctrl_ppcap_int_enable() helpers for clarity.

Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20231127104313.16661-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-loader.c b/sound/soc/sof/intel/hda-loader.c
index 46fb2d1425e9f2c0b82264407f7455b9235438b9..1805cf754beb33a09be7a76253228400a0080893 100644 (file)
--- a/sound/soc/sof/intel/hda-loader.c
+++ b/sound/soc/sof/intel/hda-loader.c
@@ -510,9 +510,8 @@ cleanup:
                return chip_info->init_core_mask;
 
        /* disable DSP */
-       snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR,
-                               SOF_HDA_REG_PP_PPCTL,
-                               SOF_HDA_PPCTL_GPROCEN, 0);
+       hda_dsp_ctrl_ppcap_enable(sdev, false);
+
        return ret;
 }
 

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 744c0dd5766d012c343a54f27e58c980bbc13631..fe4ae349dad51fb6b23bd0f485bb723029b1e7b7 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1350,8 +1350,7 @@ void hda_dsp_remove(struct snd_sof_dev *sdev)
 
        if (!sdev->dspless_mode_selected) {
                /* disable DSP IRQ */
-               snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,
-                                       SOF_HDA_PPCTL_PIE, 0);
+               hda_dsp_ctrl_ppcap_int_enable(sdev, false);
        }
 
        /* disable CIE and GIE interrupts */
@@ -1366,8 +1365,7 @@ void hda_dsp_remove(struct snd_sof_dev *sdev)
                chip->power_down_dsp(sdev);
 
        /* disable DSP */
-       snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR, SOF_HDA_REG_PP_PPCTL,
-                               SOF_HDA_PPCTL_GPROCEN, 0);
+       hda_dsp_ctrl_ppcap_enable(sdev, false);
 
 skip_disable_dsp:
        free_irq(sdev->ipc_irq, sdev);