Unverified Commit 38acab2d authored by Libin Yang's avatar Libin Yang Committed by Mark Brown
Browse files

ASoC: sof-sdw: remove CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC condition 



As CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC is always enabled in sof-soundwire
driver, let's remove the test of CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC
in the code.

Signed-off-by: default avatarLibin Yang <libin.yang@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200529193547.6077-3-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_sdw.c

+0 −8
Original line number Diff line number Diff line
@@ -663,9 +663,7 @@ static int sof_card_dai_links_create(struct device *dev, 
				     struct snd_soc_card *card)

{

	int ssp_num, sdw_be_num = 0, hdmi_num = 0, dmic_num;

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

	struct snd_soc_dai_link_component *idisp_components;

#endif

	struct snd_soc_dai_link_component *ssp_components;

	struct snd_soc_acpi_mach_params *mach_params;

	const struct snd_soc_acpi_link_adr *adr_link;
@@ -686,10 +684,8 @@ static int sof_card_dai_links_create(struct device *dev, 
	for (i = 0; i < ARRAY_SIZE(codec_info_list); i++)

		codec_info_list[i].amp_num = 0;



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

	hdmi_num = sof_sdw_quirk & SOF_SDW_TGL_HDMI ?

				SOF_TGL_HDMI_COUNT : SOF_PRE_TGL_HDMI_COUNT;

#endif



	ssp_mask = SOF_SSP_GET_PORT(sof_sdw_quirk);

	/*
@@ -849,7 +845,6 @@ static int sof_card_dai_links_create(struct device *dev, 
		INC_ID(be_id, cpu_id, link_id);

	}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

	/* HDMI */

	if (hdmi_num > 0) {

		idisp_components = devm_kcalloc(dev, hdmi_num,
@@ -886,7 +881,6 @@ static int sof_card_dai_links_create(struct device *dev, 
			      sof_sdw_hdmi_init, NULL);

		INC_ID(be_id, cpu_id, link_id);

	}

#endif



	card->dai_link = links;

	card->num_links = num_links;
@@ -920,9 +914,7 @@ static int mc_probe(struct platform_device *pdev) 


	dmi_check_system(sof_sdw_quirk_table);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

	INIT_LIST_HEAD(&ctx->hdmi_pcm_list);

#endif



	card->dev = &pdev->dev;

sound/soc/intel/boards/sof_sdw_hdmi.c

+0 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include "../../codecs/hdac_hdmi.h"

#include "hda_dsp_common.h"



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)

static struct snd_soc_jack hdmi[MAX_HDMI_NUM];



struct hdmi_pcm {
@@ -89,9 +88,3 @@ int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card) 


	return hdac_hdmi_jack_port_init(component, &card->dapm);

}
 
#else

int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card)

{

	return 0;

}

#endif