The branch main has been updated by christos:
URL:
https://cgit.FreeBSD.org/src/commit/?id=de009cf68ba68aa5823be3d6afeebb49a15b1251
commit de009cf68ba68aa5823be3d6afeebb49a15b1251
Author: Christos Margiolis <chris...@freebsd.org>
AuthorDate: 2024-10-18 08:41:36 +0000
Commit: Christos Margiolis <chris...@freebsd.org>
CommitDate: 2024-10-18 08:41:36 +0000
snd_hda: Remove duplicate HDA_INTEL_CMLK* entries
No functional change intended.
Sponsored by: The FreeBSD Foundation
MFC after: 2 days
Reviewed by: markj, emaste
Differential Revision: https://reviews.freebsd.org/D47152
---
sys/dev/sound/pci/hda/hdac.c | 2 --
sys/dev/sound/pci/hda/hdac.h | 2 --
2 files changed, 4 deletions(-)
diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index cd5fc6adb80d..929080b7ac69 100644
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -106,8 +106,6 @@ static const struct {
{ HDA_INTEL_CMLKS, "Intel Comet Lake-S", 0, 0 },
{ HDA_INTEL_CNLK, "Intel Cannon Lake", 0, 0 },
{ HDA_INTEL_ICLK, "Intel Ice Lake", 0, 0 },
- { HDA_INTEL_CMLKLP, "Intel Comet Lake-LP", 0, 0 },
- { HDA_INTEL_CMLKH, "Intel Comet Lake-H", 0, 0 },
{ HDA_INTEL_TGLK, "Intel Tiger Lake", 0, 0 },
{ HDA_INTEL_TGLKH, "Intel Tiger Lake-H", 0, 0 },
{ HDA_INTEL_GMLK, "Intel Gemini Lake", 0, 0 },
diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h
index 5e66e8eaed59..91ddbcccc9ed 100644
--- a/sys/dev/sound/pci/hda/hdac.h
+++ b/sys/dev/sound/pci/hda/hdac.h
@@ -95,8 +95,6 @@
#define HDA_INTEL_CMLKS HDA_MODEL_CONSTRUCT(INTEL, 0xa3f0)
#define HDA_INTEL_CNLK HDA_MODEL_CONSTRUCT(INTEL, 0x9dc8)
#define HDA_INTEL_ICLK HDA_MODEL_CONSTRUCT(INTEL, 0x34c8)
-#define HDA_INTEL_CMLKLP HDA_MODEL_CONSTRUCT(INTEL, 0x02c8)
-#define HDA_INTEL_CMLKH HDA_MODEL_CONSTRUCT(INTEL, 0x06c8)
#define HDA_INTEL_TGLK HDA_MODEL_CONSTRUCT(INTEL, 0xa0c8)
#define HDA_INTEL_TGLKH HDA_MODEL_CONSTRUCT(INTEL, 0x43c8)
#define HDA_INTEL_MTL HDA_MODEL_CONSTRUCT(INTEL, 0x7e28)
