ASoC: SOF: Intel: hda-stream: use SOF helpers for consistency

Not sure why we mixed sof and hdac helpers, this makes the code way
less readable.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20221024165310.246183-13-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c
index 8cb91788912cb634eb377ccf0e8c784459df800d..7ac703515be4a6532c81a33d083544d8338d1e61 100644 (file)
--- a/sound/soc/sof/intel/hda-stream.c
+++ b/sound/soc/sof/intel/hda-stream.c
@@ -697,7 +697,8 @@ bool hda_dsp_check_stream_irq(struct snd_sof_dev *sdev)
        /* The function can be called at irq thread, so use spin_lock_irq */
        spin_lock_irq(&bus->reg_lock);
 
-       status = snd_hdac_chip_readl(bus, INTSTS);
+       status = snd_sof_dsp_read(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTSTS);
+
        trace_sof_intel_hda_dsp_check_stream_irq(sdev, status);
 
        /* if Register inaccessible, ignore it.*/
@@ -778,7 +779,7 @@ irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context)
        for (i = 0, active = true; i < 10 && active; i++) {
                spin_lock_irq(&bus->reg_lock);
 
-               status = snd_hdac_chip_readl(bus, INTSTS);
+               status = snd_sof_dsp_read(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTSTS);
 
                /* check streams */
                active = hda_dsp_stream_check(bus, status);