Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 6aa232e1 authored by Rander Wang's avatar Rander Wang Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: reduce ifdef usage for hda 



Move the code for hda to one point

Signed-off-by: default avatarRander Wang <rander.wang@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190722141402.7194-12-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 184fdfca

sound/soc/sof/intel/hda-dsp.c

+10 −12
Original line number Diff line number Diff line
@@ -359,6 +359,16 @@ static int hda_resume(struct snd_sof_dev *sdev) 
		bus->io_ops->reg_writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV);



	hda_dsp_ctrl_misc_clock_gating(sdev, true);



	/* turn off the links that were off before suspend */

	list_for_each_entry(hlink, &bus->hlink_list, list) {

		if (!hlink->ref_count)

			snd_hdac_ext_bus_link_power_down(hlink);

	}



	/* check dma status and clean up CORB/RIRB buffers */

	if (!bus->cmd_dma_state)

		snd_hdac_bus_stop_cmd_io(bus);

#else



	hda_dsp_ctrl_misc_clock_gating(sdev, false);
@@ -391,18 +401,6 @@ static int hda_resume(struct snd_sof_dev *sdev) 
	hda_dsp_ctrl_ppcap_enable(sdev, true);

	hda_dsp_ctrl_ppcap_int_enable(sdev, true);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* turn off the links that were off before suspend */

	list_for_each_entry(hlink, &bus->hlink_list, list) {

		if (!hlink->ref_count)

			snd_hdac_ext_bus_link_power_down(hlink);

	}



	/* check dma status and clean up CORB/RIRB buffers */

	if (!bus->cmd_dma_state)

		snd_hdac_bus_stop_cmd_io(bus);

#endif



	return 0;

}