Skip to content

Commit 1e7cb64

Browse files
libinyangbroonie
authored andcommitted
ASoC: sof_pcm512x: remove CONFIG_SND_HDA_CODEC_HDMI condition
As CONFIG_SND_HDA_CODEC_HDMI is always enabled in sof_pcm512x, let's remove the test of CONFIG_SND_HDA_CODEC_HDMI in the sof_pcm512x driver. Signed-off-by: Libin Yang <[email protected]> Signed-off-by: Ranjani Sridharan <[email protected]> Signed-off-by: Pierre-Louis Bossart <[email protected]> Reviewed-by: Kai Vehmanen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 38acab2 commit 1e7cb64

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

sound/soc/intel/boards/sof_pcm512x.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ static struct snd_soc_dai_link_component platform_component[] = {
126126
}
127127
};
128128

129-
#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
130129
static int sof_card_late_probe(struct snd_soc_card *card)
131130
{
132131
struct sof_card_private *ctx = snd_soc_card_get_drvdata(card);
@@ -146,12 +145,6 @@ static int sof_card_late_probe(struct snd_soc_card *card)
146145

147146
return hda_dsp_hdmi_build_controls(card, pcm->codec_dai->component);
148147
}
149-
#else
150-
static int sof_card_late_probe(struct snd_soc_card *card)
151-
{
152-
return 0;
153-
}
154-
#endif
155148

156149
static const struct snd_kcontrol_new sof_controls[] = {
157150
SOC_DAPM_PIN_SWITCH("Ext Spk"),
@@ -374,14 +367,12 @@ static int sof_audio_probe(struct platform_device *pdev)
374367
sof_pcm512x_quirk = SOF_PCM512X_SSP_CODEC(2);
375368
} else {
376369
dmic_be_num = 2;
377-
#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
378370
if (mach->mach_params.common_hdmi_codec_drv &&
379371
(mach->mach_params.codec_mask & IDISP_CODEC_MASK))
380372
ctx->idisp_codec = true;
381373

382374
/* links are always present in topology */
383375
hdmi_num = 3;
384-
#endif
385376
}
386377

387378
dmi_check_system(sof_pcm512x_quirk_table);

0 commit comments

Comments
 (0)