From nobody Sun Oct 20 11:21:48 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XWbcY16P5z5YvrD; Sun, 20 Oct 2024 11:21:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XWbcX622Nz4X80; Sun, 20 Oct 2024 11:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729423308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nlYcCUMPRUC5k13njr7CInQq5yLBF0yTZuhiSo3f+qA=; b=PHo69zk1DJRAfCnR0NuIRsqoq2qtobObQUDOyB+WVItLc8bnMV2vwQIgSIsSCAZDWND0Un 5RUhgK7Zy5P2gCmb9yH62sO+GCB72tKwroJG/KtWZSl5Tidf7EOfKPbFUeMATY5DbSuWTM lx8uCMgyLAt12vLWrOCgnIgI+2DRPBAMMsKhwkheu+WNht+FDDrAVXrq6WeBiOYgR+fjZn p+R2tFGw8n941gqDYxoGaZxbdDUREocFcw+BAekpkLbQEceLiPylKoutFnHrMZfSFPpKlE 6mI7anBkjI5nQOlhhdmO0MnfnDvDWMHMLMwGbRnDzAhdrBrg7oCamImDDmbJ4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729423308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nlYcCUMPRUC5k13njr7CInQq5yLBF0yTZuhiSo3f+qA=; b=rjJREUV25TBgRncFWOWOBXrsIQ9VS3Dcxr2xZnP7V8+9RE+pWYve1CCTT25IAULVUI42yy 3rNhc85+UYub0v5Eq7bDYX5OqzgTlhg46VUQ4tDsLtdGoAKzwZGbrFBYisbeiz126bCFQ8 FtA+n53KOaiiKSOUrxd7dFLYzMYb3f29pBfiexAbXrTx9FYUH+sKA/srhGI5JeciTVyoNp nCsn/PnRBImIod/WNjOJi8TapnOEdBGxYSxOkbFycRhVqk+qjJq2S0AyKm8m9+7zKPfPjH jrnz1pQhivAUHf/U0gMWKWN1kbT4QbXz5uyPvlKcnWjg6onrZRoACEadslSACQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729423308; a=rsa-sha256; cv=none; b=tTwfoeUdQ0fJP6xuBZdRBGOlBdgRT4nb0aqM0kbSFDJyniYkgADGyoVWEQ0eV1Swc69200 0QXoARrdm6tRgw8jw9MQ/gTXsAlJhRgZT2eemG7XHXZ7lj90S3cma5gK4oE0z78ouF1A1i J3Y3c1oEp0GOIpzIDJz+PSfLU6YBR8qKjbUVLAHdVWcW3knNtyb4wU07wmf7oxi7Jx3cuG AlyHurACnt/NHvc6rpUvRsYrGl+53AhqZSVZ1Jj1VDO2I5H1/b4ubUirh9k3crUlvEoQ8+ UqYG/mW4j2BxXI8BB7Dr8C1i+ezFiz/CS62CsUTdurnP9eofB9PDHa+FDwXQxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XWbcX5f36z10Ln; Sun, 20 Oct 2024 11:21:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49KBLmRb064021; Sun, 20 Oct 2024 11:21:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49KBLmRY064018; Sun, 20 Oct 2024 11:21:48 GMT (envelope-from git) Date: Sun, 20 Oct 2024 11:21:48 GMT Message-Id: <202410201121.49KBLmRY064018@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 867b2ee99995 - stable/14 - snd_hda: Remove duplicate HDA_INTEL_CMLK* entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 867b2ee999950ac5ef4c68d1edd9cd57a13519dc Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=867b2ee999950ac5ef4c68d1edd9cd57a13519dc commit 867b2ee999950ac5ef4c68d1edd9cd57a13519dc Author: Christos Margiolis AuthorDate: 2024-10-18 08:41:36 +0000 Commit: Christos Margiolis CommitDate: 2024-10-20 11:21:06 +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 (cherry picked from commit de009cf68ba68aa5823be3d6afeebb49a15b1251) --- 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 336602b6bbf4..c25f11ba1f23 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)