ASoC: SOF: Intel: hda: use the defined stop chip in suspend
authorZhu Yingjiang <yingjiang.zhu@linux.intel.com>
Wed, 12 Jun 2019 17:23:44 +0000 (12:23 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 17 Jun 2019 12:45:39 +0000 (13:45 +0100)
Unify suspend code by using SOF common function
hda_dsp_ctrl_stop_chip() which can handle both HDA
and non-HDA cases.

Signed-off-by: Zhu Yingjiang <yingjiang.zhu@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/hda-dsp.c

index 883134d535b3a38e917bc3d05ada2a10509249c9..f2c5a12db930a4d6dfca46b8f5be0449d9c21af1 100644 (file)
@@ -311,15 +311,8 @@ static int hda_suspend(struct snd_sof_dev *sdev, int state)
        hda_dsp_ctrl_ppcap_enable(sdev, false);
        hda_dsp_ctrl_ppcap_int_enable(sdev, false);
 
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
-       /* disable hda bus irq and i/o */
-       snd_hdac_bus_stop_chip(bus);
-#else
-       /* disable hda bus irq */
-       snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL,
-                               SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN,
-                               0);
-#endif
+       /* disable hda bus irq and streams */
+       hda_dsp_ctrl_stop_chip(sdev);
 
        /* disable LP retention mode */
        snd_sof_pci_update_bits(sdev, PCI_PGCTL,