diff mbox series

[5/7] ASoC: SOF: Intel: hda: remove common_hdmi_codec_drv

Message ID 20240912120308.134762-6-yung-chuan.liao@linux.intel.com (mailing list archive)
State Accepted
Commit dfa1a7f456f10018229d0d5b3c36dd36a9b5344f
Headers show
Series ASoC: Intel: boards: updates for 6.12 - part 2 | expand

Commit Message

Bard Liao Sept. 12, 2024, 12:03 p.m. UTC 
From: Brent Lu <brent.lu@intel.com>

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>
---
 include/sound/soc-acpi.h  | 2 --
 sound/soc/sof/intel/hda.c | 1 -
 2 files changed, 3 deletions(-)
diff mbox series

Patch

diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index c1552bc6e31c..60d3b86a4660 100644
--- 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 d0a41e8e6334..70fc08c8fc99 100644
--- 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