ASoC: SOF: Intel: hda: remove common_hdmi_codec_drv

Do not set common_hdmi_codec_drv in SOF platform driver since no
machine driver needs it. Remove member variable common_hdmi_codec_drv
from snd_soc_acpi_mach_params structure.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20240912120308.134762-6-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index c1552bc6e31cd44bd7a91d291804d55b5285981f..60d3b86a4660ff6379c4afabd61dece8042f894b 100644 (file)
--- a/include/sound/soc-acpi.h
+++ b/include/sound/soc-acpi.h
@@ -62,7 +62,6 @@ static inline struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg)
  * @platform: string used for HDAudio codec support
  * @codec_mask: used for HDAudio support
  * @dmic_num: number of SoC- or chipset-attached PDM digital microphones
- * @common_hdmi_codec_drv: use commom HDAudio HDMI codec driver
  * @link_mask: SoundWire links enabled on the board
  * @links: array of SoundWire link _ADR descriptors, null terminated
  * @i2s_link_mask: I2S/TDM links enabled on the board
@@ -80,7 +79,6 @@ struct snd_soc_acpi_mach_params {
        const char *platform;
        u32 codec_mask;
        u32 dmic_num;
-       bool common_hdmi_codec_drv;
        u32 link_mask;
        const struct snd_soc_acpi_link_adr *links;
        u32 i2s_link_mask;

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index d0a41e8e6334be1df7bf1e353a7c5f7ea36d1121..70fc08c8fc99e2cf74f8906dcc95cf03628b721a 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1051,7 +1051,6 @@ static void hda_generic_machine_select(struct snd_sof_dev *sdev,
        if (*mach) {
                mach_params = &(*mach)->mach_params;
                mach_params->codec_mask = bus->codec_mask;
-               mach_params->common_hdmi_codec_drv = true;
        }
 }
 #else