aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/boards/sof_sdw_hdmi.c
diff options
context:
space:
mode:
authorLibin Yang <libin.yang@linux.intel.com>2020-05-29 14:35:46 -0500
committerMark Brown <broonie@kernel.org>2020-05-29 21:23:50 +0100
commit38acab2d61073ed4a684533d46505feba3eecf67 (patch)
tree12ab87db3fcb6d93db6be6f188861015de06bd71 /sound/soc/intel/boards/sof_sdw_hdmi.c
parentASoC: intel: add depends on SND_SOC_SOF_HDA_AUDIO_CODEC for common hdmi (diff)
downloadlinux-dev-38acab2d61073ed4a684533d46505feba3eecf67.tar.xz
linux-dev-38acab2d61073ed4a684533d46505feba3eecf67.zip
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: Libin Yang <libin.yang@linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20200529193547.6077-3-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to '')
-rw-r--r--sound/soc/intel/boards/sof_sdw_hdmi.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/intel/boards/sof_sdw_hdmi.c b/sound/soc/intel/boards/sof_sdw_hdmi.c
index b60852339330..0654b38a7e0d 100644
--- a/sound/soc/intel/boards/sof_sdw_hdmi.c
+++ b/sound/soc/intel/boards/sof_sdw_hdmi.c
@@ -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